diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 9e7a5d568e..b5f1fc28bb 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -623,8 +623,7 @@ TimerSeconds=60
 StyleIcon=1
 SampleMusicDelay=0.25
 PrevScreen=@ScreenTitleBranch()
-NextScreen=ScreenStage
-NextOptionsScreen=@SelectFirstOptionsScreen()
+NextScreen=@GetSelectMusicNext()
 DoRouletteOnMenuTimer=1
 AlignMusicBeat=0
 Codes=
@@ -4242,6 +4241,7 @@ Fallback=DifficultyMeter
 [ScreenEdit]
 Fallback=ScreenWithMenuElementsBlank
 Class=ScreenEdit
+NextScreen=ScreenEditMenu
 PrevScreen=ScreenEditMenu
 AllowOperatorMenuButton=0
 StyleIcon=0