diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 409abd96e5..3e9fed0362 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -495,10 +495,6 @@ void GameState::BeginStage()
 	if( m_iNumStagesOfThisSong != 0 )
 		LOG->Warn( "XXX: m_iNumStagesOfThisSong == %i?", m_iNumStagesOfThisSong );
 
-	/* Finish the last stage (if any), if we havn't already.  (For example, we might
-	 * have, for some reason, gone from gameplay to evaluation straight back to gameplay.) */
-	FinishStage();
-
 	ResetStageStatistics();
 
 	ARE_STAGE_MODS_FORCED.Read(); // XXX: where does this belong?
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 20b1a5a9b7..fe4bc30d1a 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -379,6 +379,10 @@ void ScreenGameplay::Init()
 			GAMESTATE->SaveCurrentSettingsToProfile(pn);
 	}
 
+	/* Finish the last stage, if we havn't already.  (For example, we might have
+	 * gone from gameplay to evaluation back to gameplay.) */
+	GAMESTATE->FinishStage();
+
 	/* Called once per stage (single song or single course). */
 	GAMESTATE->BeginStage();