diff --git a/stratosphere/ams_mitm/source/fs_mitm/fsmitm_service.hpp b/stratosphere/ams_mitm/source/fs_mitm/fsmitm_service.hpp
index e1bb3c48f..1e818aba2 100644
--- a/stratosphere/ams_mitm/source/fs_mitm/fsmitm_service.hpp
+++ b/stratosphere/ams_mitm/source/fs_mitm/fsmitm_service.hpp
@@ -61,7 +61,7 @@ class FsMitmService : public IMitmServiceObject {
 
             /* TODO: intercepting everything seems to cause issues with sleep mode, for some reason. */
             /* Figure out why, and address it. */
-            if (tid == TitleId_AppletQlaunch) {
+            if (tid == TitleId_AppletQlaunch || tid == TitleId_AppletMaintenanceMenu) {
                 has_launched_qlaunch = true;
             }
 
diff --git a/stratosphere/pm/source/pm_boot2.cpp b/stratosphere/pm/source/pm_boot2.cpp
index e04eb1c54..410eab8fc 100644
--- a/stratosphere/pm/source/pm_boot2.cpp
+++ b/stratosphere/pm/source/pm_boot2.cpp
@@ -247,6 +247,11 @@ void EmbeddedBoot2::Main() {
         if (!maintenance || std::get<bool>(launch_program)) {
             LaunchTitle(std::get<u64>(launch_program), FsStorageId_NandSystem, 0, NULL);
         }
+
+        /* In 7.0.0, Npns was added to the list of titles to launch during maintenance. */
+        if (maintenance && std::get<u64>(launch_program) == TitleId_Npns && GetRuntimeFirmwareVersion() >= FirmwareVersion_700) {
+            LaunchTitle(TitleId_Npns, FsStorageId_NandSystem, 0, NULL);
+        }
     }
     
     /* Allow for user-customizable programs. */
diff --git a/stratosphere/pm/source/pm_main.cpp b/stratosphere/pm/source/pm_main.cpp
index 3aac9a359..5c53aa250 100644
--- a/stratosphere/pm/source/pm_main.cpp
+++ b/stratosphere/pm/source/pm_main.cpp
@@ -179,7 +179,7 @@ int main(int argc, char **argv)
     /* TODO: Create services. */
     server_manager->AddWaitable(new ServiceServer<ShellService>("pm:shell", 3));
     server_manager->AddWaitable(new ServiceServer<DebugMonitorService>("pm:dmnt", 2));
-    server_manager->AddWaitable(new ServiceServer<BootModeService>("pm:bm", 5));
+    server_manager->AddWaitable(new ServiceServer<BootModeService>("pm:bm", 6));
     server_manager->AddWaitable(new ServiceServer<InformationService>("pm:info", 1));
     
     /* Loop forever, servicing our services. */