diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 13e6489ab5..6f391f801a 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -43,6 +43,7 @@ void InputMapper::ClearAllMappings()
 		FOREACH_GameButton(j)
 			for( int k=0; k<NUM_GAME_TO_DEVICE_SLOTS; k++ )
 				m_GItoDI[i][j][k].MakeInvalid();
+	UpdateTempDItoGI();
 }
 
 void InputMapper::AddDefaultMappingsForCurrentGameIfUnmapped()