diff --git a/src/core/fullscreenui.cpp b/src/core/fullscreenui.cpp
index ec66a73a6..e2419db95 100644
--- a/src/core/fullscreenui.cpp
+++ b/src/core/fullscreenui.cpp
@@ -434,9 +434,6 @@ void FullscreenUI::ToggleCheatsMenu()
       // transition and not noticeable. That's what you get for not using the game list.
       SwitchToMainWindow(MainWindowType::Settings);
     }
-
-    ForceKeyNavEnabled();
-    EnqueueSoundEffect(SFX_NAV_ACTIVATE);
   });
 }
 
diff --git a/src/core/fullscreenui_achievements.cpp b/src/core/fullscreenui_achievements.cpp
index 64df61f82..5fafd8f9e 100644
--- a/src/core/fullscreenui_achievements.cpp
+++ b/src/core/fullscreenui_achievements.cpp
@@ -1743,13 +1743,7 @@ void FullscreenUI::ToggleAchievementsWindow()
     return;
   }
 
-  PauseAndToggleMenuFromCoreThread([]() {
-    BeginTransition(TransitionEffect::ZoomIn, DEFAULT_TRANSITION_TIME, []() {
-      ForceKeyNavEnabled();
-      EnqueueSoundEffect(SFX_NAV_ACTIVATE);
-      SwitchToAchievements();
-    });
-  });
+  PauseAndToggleMenuFromCoreThread(&FullscreenUI::SwitchToAchievements);
 }
 
 void FullscreenUI::AddSubsetInfo(const rc_client_subset_t* subset)
@@ -2729,13 +2723,7 @@ void FullscreenUI::ToggleLeaderboardsWindow()
     return;
   }
 
-  PauseAndToggleMenuFromCoreThread([]() {
-    BeginTransition(TransitionEffect::ZoomIn, DEFAULT_TRANSITION_TIME, []() {
-      ForceKeyNavEnabled();
-      EnqueueSoundEffect(SFX_NAV_ACTIVATE);
-      SwitchToLeaderboards();
-    });
-  });
+  PauseAndToggleMenuFromCoreThread(&FullscreenUI::SwitchToLeaderboards);
 }
 
 void FullscreenUI::SwitchToLeaderboards()