diff --git a/stepmania/src/GameLoop.cpp b/stepmania/src/GameLoop.cpp
index 4f1bef15a0..6757894d59 100644
--- a/stepmania/src/GameLoop.cpp
+++ b/stepmania/src/GameLoop.cpp
@@ -212,6 +212,7 @@ void GameLoop::RunGameLoop()
 	}
 
 	/* If we ended mid-game, finish up. */
+	GAMESTATE->FinishStage();
 	GAMESTATE->EndGame();
 
 	if( ChangeAppPri() )
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 18b991256b..e8c103c465 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -219,6 +219,7 @@ void GameState::ApplyCmdline()
 
 void GameState::Reset()
 {
+	FinishStage();
 	EndGame();
 	
 	ASSERT( THEME );
@@ -458,10 +459,6 @@ void GameState::EndGame()
 	if( m_timeGameStarted.IsZero() || !STATSMAN->m_vPlayedStageStats.size() )	// we were in the middle of a game and played at least one song
 		return;
 
-	/* Finish the final stage. */
-	FinishStage();
-
-
 	// Update totalPlaySeconds stat
 	int iPlaySeconds = max( 0, (int) m_timeGameStarted.PeekDeltaTime() );