diff --git a/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs b/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
index 5829ba38b5..9871209760 100644
--- a/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
+++ b/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
@@ -202,7 +202,15 @@ public void TransitionTest()
         public void TransitionOutTest()
         {
             performSetup();
-            AddStep("Exit player", () => songSelect.MakeCurrent());
+            AddUntilStep(() =>
+            {
+                if (!songSelect.IsCurrentScreen())
+                {
+                    songSelect.MakeCurrent();
+                    return false;
+                }
+                return true;
+            }, "Wait for song select is current");
             AddWaitStep(5, "Wait for dim");
             AddAssert("Screen is undimmed", () => songSelect.AssertUndimmed());
         }