diff --git a/sysmodules/rosalina/source/menu.c b/sysmodules/rosalina/source/menu.c
index 1191705..bb82990 100644
--- a/sysmodules/rosalina/source/menu.c
+++ b/sysmodules/rosalina/source/menu.c
@@ -175,7 +175,7 @@ void menuThreadMain(void)
     }
 }
 
-static u32 menuRefCount = 0;
+static s32 menuRefCount = 0;
 void menuEnter(void)
 {
     Draw_Lock();
diff --git a/sysmodules/rosalina/source/menus.c b/sysmodules/rosalina/source/menus.c
index 3272ff5..41080b1 100644
--- a/sysmodules/rosalina/source/menus.c
+++ b/sysmodules/rosalina/source/menus.c
@@ -111,8 +111,9 @@ void RosalinaMenu_Reboot(void)
 
         if(pressed & BUTTON_A)
         {
-            APT_HardwareResetAsync();
             menuLeave();
+            APT_HardwareResetAsync();
+            return;
         } else if(pressed & BUTTON_B)
             return;
     }
@@ -140,6 +141,7 @@ void RosalinaMenu_PowerOff(void) // Soft shutdown.
         {
             menuLeave();
             srvPublishToSubscriber(0x203, 0);
+            return;
         }
         else if(pressed & BUTTON_B)
             return;