diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index a20bf5f16b..4876584aff 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -468,7 +468,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
 	}
 	if( CodeDetector::EnteredNextSort(GameI.controller) )
 	{
-		if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+		if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
 			m_soundLocked.Play();
 		else
 			if( m_MusicWheel.NextSort() )