diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp
index 43d589d343..d5ff91d5a2 100644
--- a/stepmania/src/DifficultyList.cpp
+++ b/stepmania/src/DifficultyList.cpp
@@ -98,8 +98,13 @@ void DifficultyList::GetCurrentRows( int iCurrentRow[NUM_PLAYERS] )
 			continue;
 
 		for( iCurrentRow[pn] = 0; iCurrentRow[pn] < (int) m_Rows.size(); ++iCurrentRow[pn] )
+		{
 			if( GAMESTATE->m_pCurNotes[pn] == m_Rows[iCurrentRow[pn]]->m_Steps )
 				break;
+			if( GAMESTATE->m_pCurNotes[pn] == NULL && 
+				m_Rows[iCurrentRow[pn]]->m_Steps->GetDifficulty() == GAMESTATE->m_PreferredDifficulty[pn] )
+				break;
+		}
 	}
 }