diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 882028a7ed..7ead014e94 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -73,8 +73,6 @@ PrefsManager::PrefsManager()
 
 PrefsManager::~PrefsManager()
 {
-	SaveGlobalPrefsToDisk();
-	SaveGamePrefsToDisk();
 }
 
  void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index da0a07fc2c..e2ce0a1573 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -375,6 +375,9 @@ int main(int argc, char* argv[])
 	/* Run the main loop. */
 	GameLoop();
 
+	PREFSMAN->SaveGlobalPrefsToDisk();
+	PREFSMAN->SaveGamePrefsToDisk();
+
 #ifndef _DEBUG
 	}
 	catch( RageException e )