diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 196e158410..2cd9a93f8f 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -4526,30 +4526,6 @@ Fallback=ScreenGameplay DifficultyMeterP1
 [ScreenJukebox DifficultyMeterP2]
 Fallback=ScreenGameplay DifficultyMeterP2
 
-[ScreenOptionsManageCourses]
-Class=ScreenOptionsManageCourses
-Fallback=ScreenOptions
-EditMode=2
-PrevScreen=ScreenTitleMenu
-NextScreen=ScreenOptionsEditCourse
-PrepareScreens=ScreenMiniMenuContext
-GroupedScreens=ScreenMiniMenuContext
-PersistScreens=ScreenMiniMenuContext
-TimerSeconds=-1
-ShowExplanations=0
-CapitalizeAllOptionNames=0
-AllowRepeatingChangeValueInput=1
-WrapValueInRow=0
-NavigationMode=menu
-ForceAllPlayers=1
-InputMode=together
-TitleX=SCREEN_LEFT+32
-TitleOnCommand=zoom,0.5;horizalign,left;ShadowLength,0
-TitleGainFocusCommand=diffuseshift;EffectColor1,1.3,1.3,1.3,1;EffectColor2,0.3,0.3,0.3,1
-TitleLoseFocusCommand=stopeffect
-HelpText=
-BulletOnCommand=hidden,1
-
 [ScreenOptionsManageEditSteps]
 Class=ScreenOptionsManageEditSteps
 Fallback=ScreenOptionsSimple
@@ -4565,11 +4541,9 @@ CapitalizeAllOptionNames=0
 AllowRepeatingChangeValueInput=1
 WrapValueInRow=0
 
-[ScreenOptionsEditCourse]
-Class=ScreenOptionsEditCourse
+[ScreenOptionsEditCoursesSimple]
 Fallback=ScreenOptions
-PrevScreen=ScreenOptionsManageCourses
-NextScreen=ScreenOptionsEditCourseEntry
+EditMode=2
 PrepareScreens=ScreenMiniMenuContext
 GroupedScreens=ScreenMiniMenuContext
 PersistScreens=ScreenMiniMenuContext
@@ -4581,22 +4555,30 @@ WrapValueInRow=0
 NavigationMode=menu
 ForceAllPlayers=1
 InputMode=together
+TitleOnCommand=zoom,0.5;horizalign,left;ShadowLength,0
+TitleGainFocusCommand=diffuseshift;EffectColor1,1.3,1.3,1.3,1;EffectColor2,0.3,0.3,0.3,1
+TitleLoseFocusCommand=stopeffect
 HelpText=
-ShowUnderlines=0
+BulletOnCommand=hidden,1
+
+[ScreenOptionsManageCourses]
+Class=ScreenOptionsManageCourses
+Fallback=ScreenOptionsEditCoursesSimple
+PrevScreen=ScreenTitleMenu
+NextScreen=ScreenOptionsEditCourse
+TitleX=SCREEN_LEFT+32
+
+[ScreenOptionsEditCourse]
+Class=ScreenOptionsEditCourse
+Fallback=ScreenOptionsEditCoursesSimple
+PrevScreen=ScreenOptionsManageCourses
+NextScreen=ScreenOptionsEditCourseEntry
 
 [ScreenOptionsEditCourseEntry]
 Class=ScreenOptionsEditCourseEntry
-Fallback=ScreenOptionsSimple
+Fallback=ScreenOptionsEditCoursesSimple
 PrevScreen=ScreenOptionsEditCourse
 NextScreen=ScreenOptionsEditCourse
-PrepareScreens=ScreenMiniMenuContext
-GroupedScreens=ScreenMiniMenuContext
-PersistScreens=ScreenMiniMenuContext
-TimerSeconds=-1
-ShowExplanations=0
-CapitalizeAllOptionNames=0
-AllowRepeatingChangeValueInput=1
-WrapValueInRow=0
 
 [ScreenEditCourseMods]
 Class=ScreenEditCourseMods