diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index c72ba9377f..3148289b6d 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2133,6 +2133,7 @@ Row7Y=SCREEN_CENTER_Y+100
 
 [ScreenEditMenu]
 Fallback=ScreenWithMenuElements
+NextScreen=ScreenEdit
 PrevScreen=@ScreenTitleBranch()
 Class=ScreenEditMenu
 ExplanationX=SCREEN_CENTER_X
@@ -2541,10 +2542,14 @@ PrevScreen=ScreenOptionsMenu
 [ScreenTestInput]
 Class=ScreenTestInput
 Fallback=ScreenOperatorMenu
+NextScreen=ScreenOptionsMenu
+PrevScreen=ScreenOptionsMenu
 
 [ScreenTestLights]
 Class=ScreenTestLights
 Fallback=ScreenOperatorMenu
+NextScreen=ScreenOptionsMenu
+PrevScreen=ScreenOptionsMenu
 TextX=SCREEN_CENTER_X-200
 TextY=SCREEN_CENTER_Y
 TextOnCommand=
@@ -2557,6 +2562,8 @@ Fallback=ScreenOptionsSubmenu
 [ScreenBookkeeping]
 Class=ScreenBookkeeping
 Fallback=ScreenOperatorMenu
+NextScreen=ScreenOptionsMenu
+PrevScreen=ScreenOptionsMenu
 AllTimeX=SCREEN_CENTER_X
 AllTimeY=110
 AllTimeOnCommand=zoom,0.7;diffuseshift;EffectColor1,0.5,0.5,0.5,1
@@ -3567,6 +3574,7 @@ AllowStyleTypes=TwoPlayersTwoSides
 ShowCourseModifiersProbability=0
 Class=ScreenJukebox
 Fallback=ScreenGameplay
+NextScreen=ScreenJukebox
 StartScreen=@ScreenTitleBranch()
 AllowAdvancedModifiers=1