diff --git a/stepmania/src/GameLoop.cpp b/stepmania/src/GameLoop.cpp
index 4e7b466638..2666d2d265 100644
--- a/stepmania/src/GameLoop.cpp
+++ b/stepmania/src/GameLoop.cpp
@@ -215,6 +215,9 @@ void GameLoop::RunGameLoop()
 		SCREENMAN->Draw();
 	}
 
+	/* If we ended mid-game, finish up. */
+	GAMESTATE->EndGame();
+
 	if( ChangeAppPri() )
 		HOOKS->UnBoostPriority();
 }
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index cef588c3c4..d657e51f5f 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1117,9 +1117,6 @@ int main(int argc, char* argv[])
 	else
 		GameLoop::RunGameLoop();
 
-	/* If we ended mid-game, finish up. */
-	GAMESTATE->EndGame();
-
 	PREFSMAN->SavePrefsToDisk();
 
 	ShutdownGame();