diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua
index 41c74b03d9..7738d499bc 100644
--- a/stepmania/Themes/default/Scripts/Branches.lua
+++ b/stepmania/Themes/default/Scripts/Branches.lua
@@ -108,8 +108,8 @@ local function GetEvaluationNextScreenInternal( sNextScreen, sFailedScreen, sEnd
 
 	local sIsStage = not GetTopScreenMetric( "Summary" ) and not GAMESTATE:IsCourseMode()
 	if sIsStage then
-		local bHasAnotherStage = not bIsExtraStage or GAMESTATE:HasEarnedExtraStage()
-		if bHasAnotherStage then
+		local bLastStage = GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer() <= 0
+		if not bLastStage then
 			Trace( "Another" )
 			return sNextScreen
 		end