diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation stage.lua b/stepmania/Themes/default/Graphics/ScreenEvaluation stage.lua
new file mode 100644
index 0000000000..297536b6e8
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation stage.lua	
@@ -0,0 +1,4 @@
+local t = LoadActor("ScreenWithMenuElements stage/stage" ) .. {
+	BeginCommand=cmd(playcommand,"Set", { StageToShow = SCREENMAN:GetTopScreen():GetStageStats():GetStage() } );
+};
+return t;
diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/default.lua
index aca998902c..e8e81a8dd3 100644
--- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/default.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/default.lua	
@@ -1,16 +1,8 @@
-local stages = { }
-for _, s in ipairs(Stage) do
-	if GAMESTATE:IsStagePossible(s) then
-		local t = LoadActor("_stage " .. s) .. {
-			InitCommand = cmd(playcommand,"Update"),
-			CurrentSongChangedMessageCommand=cmd(playcommand,"Update"),
+local t = LoadActor("stage" ) .. {
+	BeginCommand=cmd(playcommand,"Update");
+	CurrentSongChangedMessageCommand=cmd(playcommand,"Update");
+	UpdateCommand=cmd(playcommand,"Set", { StageToShow = GAMESTATE:GetCurrentStage(); } );
+};
 
-			UpdateCommand=cmd(visible, GAMESTATE:GetCurrentStage() == s)
-		}
-		table.insert( stages, t )
-	end
-end
+return t;
 
-return Def.ActorFrame {
-	children = stages
-}
diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/stage.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/stage.lua
new file mode 100644
index 0000000000..735467964c
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/stage.lua	
@@ -0,0 +1,11 @@
+local stages = Def.ActorFrame {
+};
+
+for _, s in ipairs(Stage) do
+--	if GAMESTATE:IsStagePossible(s) then
+	stages[#stages+1] = LoadActor("_stage " .. s) .. {
+		SetCommand=function(self, params) self:visible( params.StageToShow == s ) end;
+	}
+end
+
+return stages;