diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index e3f1694ee5..803cab9325 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -113,11 +113,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        [Ignore("Will be resolved with merge of https://github.com/ppy/osu/pull/6992")]
         public void TestExitTooSoon()
         {
-            pauseAndConfirm();
+            AddStep("seek before gameplay", () => Player.GameplayClockContainer.Seek(-5000));
 
+            pauseAndConfirm();
             resume();
 
             AddStep("exit too soon", () => Player.Exit());
@@ -177,7 +177,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestExitFromGameplay()
         {
             AddStep("exit", () => Player.Exit());
+            confirmPaused();
 
+            AddStep("exit", () => Player.Exit());
             confirmExited();
         }
 
@@ -213,9 +215,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        [Ignore("Will be resolved with merge of https://github.com/ppy/osu/pull/6992")]
         public void TestRestartAfterResume()
         {
+            AddStep("seek before gameplay", () => Player.GameplayClockContainer.Seek(-5000));
+
             pauseAndConfirm();
             resumeAndConfirm();
             restart();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7f32db2ebf..d40c448452 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -536,6 +536,12 @@ namespace osu.Game.Screens.Play
                     return true;
             }
 
+            if (canPause)
+            {
+                Pause();
+                return true;
+            }
+
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer.StopUsingBeatmapClock();