diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0a472d4dc1..325d2cbd85 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -306,7 +306,7 @@ private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap)
         private void currentTrackCompleted()
         {
             if (!Beatmap.Value.Track.Looping && !Beatmap.Disabled)
-                musicController.NextTrack();
+                MusicController.NextTrack();
         }
 
         #endregion
@@ -484,7 +484,7 @@ protected override void LoadComplete()
                 Origin = Anchor.TopRight,
             }, rightFloatingOverlayContent.Add, true);
 
-            loadComponentSingleFile(musicController = new MusicController
+            loadComponentSingleFile(MusicController = new MusicController
             {
                 GetToolbarHeight = () => ToolbarOffset,
                 Anchor = Anchor.TopRight,
@@ -752,7 +752,7 @@ private void updateActiveState(bool isActive)
 
         private ScalingContainer screenContainer;
 
-        private MusicController musicController;
+        public MusicController MusicController { get; private set; }
 
         protected override bool OnExiting()
         {
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 29ae5983be..3db71d39ee 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -66,6 +66,8 @@ public class MusicController : OsuFocusedOverlayContainer
         /// </summary>
         public Func<float> GetToolbarHeight;
 
+        public bool UserRequestedPause { get; private set; }
+
         public MusicController()
         {
             Width = 400;
@@ -287,6 +289,8 @@ private void play()
                 return;
             }
 
+            UserRequestedPause = track.IsRunning;
+
             if (track.IsRunning)
                 track.Stop();
             else
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0a9f7672d3..cffe756548 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -243,21 +243,6 @@ public override bool OnExiting(IScreen next)
         {
             Background.FadeColour(Color4.White, 500);
 
-            if (Beatmap.Value.Track != null)
-            {
-                if (isExitingGame)
-                {
-                    Beatmap.Value.Track.Stop();
-                }
-                else
-                {
-                    Beatmap.Value.Track.Tempo.Value = 1;
-                    Beatmap.Value.Track.Start();
-                }
-            }
-
-            host.Exiting -= onExitingGame;
-
             return base.OnExiting(next);
         }
 
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c64bea840f..dcce49179d 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -120,7 +120,7 @@ public override void OnEntering(IScreen last)
             var track = Beatmap.Value.Track;
             var metadata = Beatmap.Value.Metadata;
 
-            if (last is Intro && track != null)
+            if (last is Intro && track != null && !Game.MusicController.UserRequestedPause)
             {
                 if (!track.IsRunning)
                 {
@@ -189,6 +189,8 @@ public override void OnResuming(IScreen last)
 
             //we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
+
+            ResumeIfNoUserPauseRequested();
         }
 
         public override bool OnExiting(IScreen next)
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 328631ff9c..0682710133 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -50,7 +50,7 @@ public abstract class OsuScreen : Screen, IOsuScreen, IHasDescription
 
         public virtual bool CursorVisible => true;
 
-        protected new OsuGameBase Game => base.Game as OsuGameBase;
+        protected new OsuGame Game => base.Game as OsuGame;
 
         /// <summary>
         /// The <see cref="UserActivity"/> to set the user's activity automatically to when this screen is entered
@@ -179,6 +179,15 @@ private void updateActivity()
                 api.Activity.Value = activity;
         }
 
+        protected void ResumeIfNoUserPauseRequested()
+        {
+            if (Beatmap.Value.Track != null && !Game.MusicController.UserRequestedPause)
+            {
+                Beatmap.Value.Track.Tempo.Value = 1;
+                Beatmap.Value.Track.Start();
+            }
+        }
+
         /// <summary>
         /// Fired when this screen was entered or resumed and the logo state is required to be adjusted.
         /// </summary>
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index bf5857f725..17b2ae376f 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -426,6 +426,8 @@ public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
 
+            ResumeIfNoUserPauseRequested();
+
             this.FadeInFromZero(250);
             FilterControl.Activate();
         }