diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 61c14c0fff..6937651b5f 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -916,7 +916,8 @@ void ScreenSelectMusic::SwitchToPreferredDifficulty()
 
 void ScreenSelectMusic::AfterMusicChange()
 {
-	m_Menu.m_MenuTimer.Stall();
+	if( !m_MusicWheel.IsRouletting() )
+		m_Menu.m_MenuTimer.Stall();
 
 	Song* pSong = m_MusicWheel.GetSelectedSong();
 	if( pSong )