diff --git a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua
index 5394ab5d25..e0baff0761 100644
--- a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua	
+++ b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua	
@@ -6,25 +6,34 @@ local t = Def.ActorFrame {};
 t[#t+1] = Def.ActorFrame {
 	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",64,12);
 	LoadFont("Common Normal") .. {
-		InitCommand=cmd(y,-1;shadowlength,1;playcommand,"Set");
-        SetCommand=function(self)
-          if GAMESTATE:GetCurrentCourse() then
-            self:settext( GAMESTATE:GetCurrentStageIndex()+1 .. " / " .. GAMESTATE:GetCurrentCourse():GetEstimatedNumStages() );
-          elseif GAMESTATE:IsEventMode() then
-            self:settextf("Stage %s", curStageIndex+1);
-          else
-            if THEME:GetMetric(curScreen,"StageDisplayUseShortString") then
-              self:settextf("%s", ToEnumShortString(curStage));
-              self:zoom(0.75);
-            else
-              self:settextf("%s Stage", ToEnumShortString(curStage));
-              self:zoom(1);
-            end;
-          end;
-          -- StepMania is being stupid so we have to do this here;
-          self:diffuse(StageToColor(curStage));
-          self:diffusetopedge(ColorLightTone(StageToColor(curStage)));
-        end;
+		InitCommand=cmd(y,-1;shadowlength,1;);
+		BeginCommand=function(self)
+			local top = SCREENMAN:GetTopScreen()
+			if top then
+				if not string.find(top:GetName(),"ScreenEvaluation") then
+					curStageIndex = curStageIndex + 1
+				end
+			end
+			self:playcommand("Set")
+		end;
+		SetCommand=function(self)
+			if GAMESTATE:GetCurrentCourse() then
+				self:settext( curStageIndex+1 .. " / " .. GAMESTATE:GetCurrentCourse():GetEstimatedNumStages() );
+			elseif GAMESTATE:IsEventMode() then
+				self:settextf("Stage %s", curStageIndex);
+			else
+				if THEME:GetMetric(curScreen,"StageDisplayUseShortString") then
+				  self:settextf("%s", ToEnumShortString(curStage));
+				  self:zoom(0.75);
+				else
+				  self:settextf("%s Stage", ToEnumShortString(curStage));
+				  self:zoom(1);
+				end;
+			end;
+			-- StepMania is being stupid so we have to do this here;
+			self:diffuse(StageToColor(curStage));
+			self:diffusetopedge(ColorLightTone(StageToColor(curStage)));
+		end;
 	};
 };
 return t
\ No newline at end of file