diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
index 3a4dc09e26..dfe7ba0252 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Moq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -55,6 +56,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 return overlay.State.Value == Visibility.Hidden;
             });
 
+            AddUntilStep("wait for screens removed", () => !overlay.ChildrenOfType<Screen>().Any());
+
             AddStep("display again on demand", () => overlay.Show());
 
             AddUntilStep("back at start", () => overlay.CurrentScreen is ScreenWelcome);