diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index 1a6ebed425..d26aacf2bc 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -38,11 +38,12 @@ namespace osu.Game.Tests.Visual
 
         private void addExitAllScreensStep()
         {
-            AddStep("exit all screens", () =>
+            AddUntilStep("exit all screens", () =>
             {
-                if (Stack.CurrentScreen == null) return;
+                if (Stack.CurrentScreen == null) return true;
 
                 Stack.Exit();
+                return false;
             });
         }
     }