diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 38068ec751..769688e829 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -319,6 +319,8 @@ namespace osu.Game.Screens.Play
 
             if (this.IsCurrentScreen())
                 performImmediateExit();
+            else
+                this.MakeCurrent();
         }
 
         private ScheduledDelegate completionProgressDelegate;
diff --git a/osu.Game/Screens/Ranking/Pages/RetryButton.cs b/osu.Game/Screens/Ranking/Pages/RetryButton.cs
index c4f63b265d..2a281224c1 100644
--- a/osu.Game/Screens/Ranking/Pages/RetryButton.cs
+++ b/osu.Game/Screens/Ranking/Pages/RetryButton.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;
@@ -49,11 +48,7 @@ namespace osu.Game.Screens.Ranking.Pages
             background.Colour = colours.Green;
 
             if (player != null)
-                Action = () =>
-                {
-                    player.Restart();
-                    player.MakeCurrent();
-                };
+                Action = () => player.Restart();
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs
index a7ff1fe6a0..ca2ee5adae 100644
--- a/osu.Game/Screens/Ranking/Results.cs
+++ b/osu.Game/Screens/Ranking/Results.cs
@@ -262,7 +262,6 @@ namespace osu.Game.Screens.Ranking
                         if (!this.IsCurrentScreen()) return;
 
                         player.Restart();
-                        player.MakeCurrent();
                     },
                 },
             };