diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 184f916434..e70a035203 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -469,10 +469,13 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 			for ( i=0; arraySongs.size() < 30 && i < arrayAllSongs.size(); i++ )
 			{
 				// weed out songs that require more songs than are available
-				if ( SONGMAN->GetNumStagesForSong(arrayAllSongs[i]) > GAMESTATE->GetNumStagesLeft() )
+				Song *pSong = arrayAllSongs[i];
+				if( SONGMAN->GetNumStagesForSong(pSong) > GAMESTATE->GetNumStagesLeft() )
+					continue;
+				if( UNLOCKSYS->SongIsLocked(pSong) )
 					continue;
 
-				arraySongs.push_back(arrayAllSongs[i]);
+				arraySongs.push_back( pSong );
 			}
 
 			bUseSections = false;