diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 1b9e4a8182..870b716cfd 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -910,7 +910,11 @@ bool GameState::IsFinalStage() const
 	if( IsCourseMode() )
 		return true;
 
-	return GetLargestCurrentStageIndexForAnyHumanPlayer() == PREFSMAN->m_iSongsPerPlay - 1;
+	/* This changes dynamically on ScreenSelectMusic as the wheel turns. */
+	int iPredictedStageForCurSong = GetNumStagesForCurrentSongAndStepsOrCourse();
+	if( iPredictedStageForCurSong == -1 )
+		iPredictedStageForCurSong = 1;
+	return GetLargestCurrentStageIndexForAnyHumanPlayer() + iPredictedStageForCurSong == PREFSMAN->m_iSongsPerPlay;
 }
 
 bool GameState::IsAnExtraStage() const