diff --git a/Themes/_fallback/Scripts/02 Other.lua b/Themes/_fallback/Scripts/02 Other.lua
index 97b991197f..e84f3b1875 100644
--- a/Themes/_fallback/Scripts/02 Other.lua	
+++ b/Themes/_fallback/Scripts/02 Other.lua	
@@ -133,6 +133,10 @@ function TextBannerAfterSet(self,param)
 	end
 end
 
+function Song:GetStageCost()
+	return self:IsMarathon() and 3 or self:IsLong() and 2 or 1
+end
+
 -- (c) 2005 Chris Danford
 -- All rights reserved.
 -- 
diff --git a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua
index f50e397d86..63069ae849 100644
--- a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua	
+++ b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua	
@@ -12,7 +12,9 @@ local tRemap = {
 	Stage_6th		= 6,
 };
 
-if tRemap[sStage] == PREFSMAN:GetPreference("SongsPerPlay") then
+local nSongCount = tRemap[sStage] + (GAMESTATE:GetCurrentSong():GetStageCost()-1);
+
+if nSongCount >= PREFSMAN:GetPreference("SongsPerPlay") then
 	sStage = "Stage_Final";
 else
 	sStage = sStage;