diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index e5a887e203..75bf8122c1 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3465,18 +3465,24 @@ FrameLoseFocusCommand=diffuse,1,1,1,1;stopeffect
 Fallback="OptionRowSimple"
 ItemOnCommand=visible,false
 
-[ScreenOptionsService]
-Class="ScreenOptionsMaster"
+[ScreenOptionsServiceSelectionList]
 Fallback="ScreenOptionsSimple"
 LightsMode="LightsMode_MenuStartAndDirections"
-; This NextScreen is only used for the "exit" choice.
-NextScreen=ScreenTitleBranch()
-PrevScreen=ScreenTitleBranch()
 TimerOnCommand=visible,false
 ShowStyleIcon=false
 TimerSeconds=-1
 AllowOperatorMenuButton=false
 HelpText=ScreenString("HelpTextOptionsSimpleAndBack")
+; This NextScreen is only used for the "exit" choice.
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
+
+[ScreenOptionsService]
+Class="ScreenOptionsMaster"
+Fallback="ScreenOptionsServiceSelectionList"
+; This NextScreen is only used for the "exit" choice.
+NextScreen=ScreenTitleBranch()
+PrevScreen=ScreenTitleBranch()
 LineNames="1,2,3,4,5,6,7,8"
 Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
 Line2="gamecommand;screen,ScreenTestInput;name,Test Input"