diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 323f0d9fc8..caa40922d7 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -221,6 +221,11 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 		{
 			for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
 			{
+				/* Wrap first; the number of songs can change if we reload. */
+				wrap( g_iLastSongShown,vpSongs.size() ); 
+
+				int FirstSongShown = g_iLastSongShown;
+
 				for( int j=0; j<NUM_SONGS_TO_SHOW; j++ )
 				{
 					PageToShow pts;
@@ -232,6 +237,9 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 					
 					g_iLastSongShown++;
 					wrap( g_iLastSongShown,vpSongs.size() ); 
+
+					if( g_iLastSongShown == FirstSongShown )
+						break; /* don't show songs twice */
 				}
 			}
 		}