diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index efbc38d963..82a0c39c94 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -308,6 +308,7 @@ void ResetGame( bool ReturnToFirstScreen )
 		{
 			LOG->Info( "Remapping joysticks." );
 			INPUTMAPPER->AutoMapJoysticksForCurrentGame();
+			INPUTMAPPER->SaveMappingsToDisk();
 		}
 
 		PREFSMAN->m_sLastSeenInputDevices = sInputDevices;