diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 582a4cf5a0..f33c13cfb0 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -1349,12 +1349,15 @@ void ScreenSelectMusic::SwitchToPreferredDifficulty()
 					break;
 				}
 
-				int iDiff = abs(m_vpSteps[i]->GetDifficulty() - GAMESTATE->m_PreferredDifficulty[pn]);
-
-				if( iCurDifference == -1 || iDiff < iCurDifference )
+				if( GAMESTATE->m_PreferredDifficulty[pn] != DIFFICULTY_INVALID )
 				{
-					iSelection = i;
-					iCurDifference = iDiff;
+					int iDiff = abs(m_vpSteps[i]->GetDifficulty() - GAMESTATE->m_PreferredDifficulty[pn]);
+
+					if( iCurDifference == -1 || iDiff < iCurDifference )
+					{
+						iSelection = i;
+						iCurDifference = iDiff;
+					}
 				}
 			}