diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index ca01496650..2ef8b642d6 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -2272,7 +2272,10 @@ void ScreenGameplay::StageFinished( bool bBackedOut )
 		STATSMAN->m_vPlayedStageStats.push_back( STATSMAN->m_CurStageStats );
 
 	/* Reset options. */
-	GAMESTATE->RestoreStageOptions();
+	if( bBackedOut )
+		GAMESTATE->RestoreSelectedOptions();
+	else
+		GAMESTATE->RestoreStageOptions();
 }
 
 void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )