diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 2cc6290c0c..9454a082c5 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -4224,7 +4224,13 @@ InfoOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0
 PlayRecordHelpX=SCREEN_LEFT+20
 PlayRecordHelpY=SCREEN_BOTTOM-20
 PlayRecordHelpOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0
-	
+
+[ScreenPlayerOptionsEdit]
+Fallback=ScreenPlayerOptions
+
+[ScreenSongOptionsEdit]
+Fallback=ScreenSongOptions
+
 [CatalogXml]
 ShowPlayModeRegular=1
 ShowPlayModeNonstop=1
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 791d81455e..a0c1c24a0b 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1835,10 +1835,10 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
 				PROMPT_YES_NO, ANSWER_NO );
 			break;
 		case player_options:
-			SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions" );
+			SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptionsEdit" );
 			break;
 		case song_options:
-			SCREENMAN->AddNewScreenToTop( "ScreenSongOptions" );
+			SCREENMAN->AddNewScreenToTop( "ScreenSongOptionsEdit" );
 			break;
 		case edit_song_info:
 			{