diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 00b46badd3..4d83838a8c 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -146,6 +146,7 @@ MusicWheel::MusicWheel()
 			{
 				GAMESTATE->m_pCurNotes[p] = pNotes;
 				GAMESTATE->m_PlayerOptions[p] = po;
+				GAMESTATE->m_PreferredDifficulty[p] = pNotes->GetDifficulty();
 			}
 		}
 		GAMESTATE->m_SongOptions = so;
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index b6d5d04b9e..623a617a31 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -776,14 +776,6 @@ void ScreenSelectMusic::SwitchToPreferredDifficulty()
 		if( !GAMESTATE->IsHumanPlayer( PlayerNumber(p) ) )
 			continue;
 
-		if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
-		{
-			/* Extra stage; just keep the difficulty selected by
-			 * SongManager::GetExtraStageInfo. */
-			m_iSelection[p] = GAMESTATE->m_pCurNotes[p]->GetDifficulty();
-			continue;
-		}
-
 		/* Find the closest match to the user's preferred difficulty. */
 		int CurDifference = -1;
 		for( unsigned i=0; i<m_arrayNotes[p].size(); i++ )