diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0af3dcecba..3b67f8d6e6 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -22,9 +22,6 @@
 using System.Linq;
 using osu.Framework.Threading;
 using osu.Game.Modes.Scoring;
-using OpenTK.Input;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Graphics.Sprites;
 using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Play
@@ -63,16 +60,11 @@ public class Player : OsuScreen
         private HudOverlay hudOverlay;
         private PauseOverlay pauseOverlay;
         private FailOverlay failOverlay;
-        private Box retryOverlay;
-
-        private SampleChannel SampleClick;
+        private RetryOverlay retryOverlay;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager config)
         {
-            AlwaysPresent = true;
-            SampleClick = audio.Sample.Get(@"Menu/menuback");
-
             var beatmap = Beatmap.Beatmap;
 
             if (beatmap.BeatmapInfo?.Mode > PlayMode.Taiko)
@@ -168,12 +160,11 @@ private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager
                     OnRetry = Restart,
                     OnQuit = Exit,
                 },
-                retryOverlay = new Box
+                retryOverlay = new RetryOverlay
                 {
-                    Alpha = 0,
-                    AlwaysPresent = true,
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
+                    Action = Restart,
+                    OnKeyPressed = () => Content.FadeColour(Color4.Black, 500),
+                    OnKeyReleased = () => Content.FadeColour(Color4.White, 200),
                 }
             };
         }
@@ -348,41 +339,5 @@ protected override bool OnExiting(Screen next)
         private Bindable<bool> mouseWheelDisabled;
 
         protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;
-
-        private bool isHolded;
-        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
-        {
-            if (args.Repeat) return false;
-
-            if (args.Key == Key.Tilde)
-            {
-                isHolded = true;
-
-                retryOverlay.FadeIn(500);
-
-                Delay(500).Schedule(() =>{
-                    if (isHolded)
-                    {
-                        SampleClick.Play();
-                        Restart();
-                    }
-                });
-                return true;
-            }
-
-            return base.OnKeyDown(state, args);
-        }
-
-        protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
-        {
-            if (args.Key == Key.Tilde)
-            {
-                isHolded = false;
-                retryOverlay.FadeOut(200);
-                return true;
-            }
-
-            return base.OnKeyUp(state, args);
-        }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Screens/Play/RetryOverlay.cs b/osu.Game/Screens/Play/RetryOverlay.cs
new file mode 100644
index 0000000000..e44f7d8914
--- /dev/null
+++ b/osu.Game/Screens/Play/RetryOverlay.cs
@@ -0,0 +1,65 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Input;
+using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Audio;
+using System;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Play
+{
+    public class RetryOverlay : Container
+    {
+        public Action Action;
+        public Action OnKeyPressed;
+        public Action OnKeyReleased;
+
+        private SampleChannel retrySample;
+        private bool keyIsHeld;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            retrySample = audio.Sample.Get(@"Menu/menuback");
+            AlwaysPresent = true;
+        }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Repeat) return false;
+
+            if (args.Key == Key.Tilde)
+            {
+                keyIsHeld = true;
+                OnKeyPressed();
+
+                Delay(500).Schedule(() =>
+                {
+                    if (keyIsHeld)
+                    {
+                        retrySample.Play();
+                        Action();
+                    }
+                });
+                return true;
+            }
+
+            return base.OnKeyDown(state, args);
+        }
+
+        protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
+        {
+            if (args.Key == Key.Tilde)
+            {
+                keyIsHeld = false;
+                OnKeyReleased();
+                return true;
+            }
+
+            return base.OnKeyUp(state, args);
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6dd5ec3088..1777bf6dc2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -180,6 +180,7 @@
     <Compile Include="Screens\Backgrounds\BackgroundScreenEmpty.cs" />
     <Compile Include="Screens\Charts\ChartInfo.cs" />
     <Compile Include="Screens\Edit\Editor.cs" />
+    <Compile Include="Screens\Play\RetryOverlay.cs" />
     <Compile Include="Screens\ScreenWhiteBox.cs" />
     <Compile Include="Screens\Loader.cs" />
     <Compile Include="Screens\Menu\Button.cs" />