diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 4b9e260afb..3ed7540f9b 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -574,8 +574,12 @@ void PrefsManager::ReadGlobalPrefsFromIni( const IniFile &ini )
 		(*p)->ReadFrom( ini );
 }
 
-void PrefsManager::SaveGlobalPrefsToDisk() const
+void PrefsManager::SaveGlobalPrefsToDisk()
 {
+	// Re-read before writing so we don't clobber any changes the use made while 
+	// the program was running.
+	ReadGlobalPrefsFromDisk();
+
 	IniFile ini;
 	SaveGlobalPrefsToIni( ini );
 	ini.WriteFile( STEPMANIA_INI_PATH );
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 5ffea8ecdd..a22f16b5df 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -306,7 +306,7 @@ public:
 	void SaveGlobalPrefsToIni( IniFile &ini ) const;
 
 	void ReadGlobalPrefsFromDisk();
-	void SaveGlobalPrefsToDisk() const;
+	void SaveGlobalPrefsToDisk();
 
 	void ResetToFactoryDefaults();