diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 93a734589c..d32fae1b90 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -153,8 +153,6 @@ namespace osu.Game.Screens.Play
         {
             base.OnEntering(last);
 
-            prepareNewPlayer();
-
             content.ScaleTo(0.7f);
             Background?.FadeColour(Color4.White, 800, Easing.OutQuint);
 
@@ -172,11 +170,6 @@ namespace osu.Game.Screens.Play
 
             contentIn();
 
-            MetadataInfo.Loading = true;
-
-            // we will only be resumed if the player has requested a re-run (see restartRequested).
-            prepareNewPlayer();
-
             this.Delay(400).Schedule(pushWhenLoaded);
         }
 
@@ -257,6 +250,9 @@ namespace osu.Game.Screens.Play
 
         private void prepareNewPlayer()
         {
+            if (!this.IsCurrentScreen())
+                return;
+
             var restartCount = player?.RestartCount + 1 ?? 0;
 
             player = createPlayer();
@@ -274,8 +270,10 @@ namespace osu.Game.Screens.Play
 
         private void contentIn()
         {
-            content.ScaleTo(1, 650, Easing.OutQuint);
+            MetadataInfo.Loading = true;
+
             content.FadeInFromZero(400);
+            content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
         }
 
         private void contentOut()