diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp
index 5c7d9a6b6b..47394c8eef 100644
--- a/src/MusicWheel.cpp
+++ b/src/MusicWheel.cpp
@@ -1405,8 +1405,12 @@ RString MusicWheel::JumpToNextGroup()
 
 		for(unsigned i = 0 ; i < iNumGroups ; i++)
 		{
-			if( m_sExpandedSectionName == SONGMAN->GetSongGroupByIndex(i) )
+			RString sCurSongGroup = SONGMAN->GetSongGroupByIndex(i);
+
+			if( m_sExpandedSectionName == sCurSongGroup )
 			{
+				if( SONGMAN->GetSongsOfCurrentGame(sCurSongGroup).size() == 0 ) continue;
+
 				if ( i < iNumGroups - 1 )
 					return SONGMAN->GetSongGroupByIndex(i+1);
 				else
@@ -1451,8 +1455,12 @@ RString MusicWheel::JumpToPrevGroup()
 
 		for(unsigned i = 0 ; i < iNumGroups ; i++)
 		{
-			if( m_sExpandedSectionName == SONGMAN->GetSongGroupByIndex(i) )
+			RString sCurSongGroup = SONGMAN->GetSongGroupByIndex(i);
+
+			if( m_sExpandedSectionName == sCurSongGroup )
 			{
+				if( SONGMAN->GetSongsOfCurrentGame(sCurSongGroup).size() == 0 ) continue;
+
 				if ( i > 0 )
 					return SONGMAN->GetSongGroupByIndex(i-1);
 				else