diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fd68aa0fb3..cea041b04d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -298,8 +298,6 @@ namespace osu.Game
 
         private Container overlayContent;
 
-        public readonly Bindable<OsuScreen> CurrentScreen = new Bindable<OsuScreen>();
-
         private FrameworkConfigManager frameworkConfig;
 
         private void screenChanged(Screen newScreen)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 306cdaddf0..56224675c1 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -18,6 +18,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.Processing;
 using osu.Game.Online.API;
+using osu.Game.Screens;
 using SQLite.Net;
 using osu.Framework.Graphics.Performance;
 
@@ -45,6 +46,8 @@ namespace osu.Game
 
         public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
+        public readonly Bindable<OsuScreen> CurrentScreen = new Bindable<OsuScreen>();
+
         private Bindable<bool> fpsDisplayVisible;
 
         protected AssemblyName AssemblyName => Assembly.GetEntryAssembly()?.GetName() ?? new AssemblyName { Version = new Version() };
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index e3dca32383..3c91b8de41 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGame game, OsuColour colours, LocalisationEngine localisation)
+        private void load(OsuGameBase game, OsuColour colours, LocalisationEngine localisation)
         {
             this.localisation = localisation;
 
@@ -222,7 +222,7 @@ namespace osu.Game.Overlays
 
         private void screenChanged(OsuScreen newScreen)
         {
-            canChangeBeatmap = newScreen?.CanChangeBeatmap ?? false;
+            canChangeBeatmap = newScreen?.CanChangeBeatmap ?? true;
 
             prevButton.Enabled = canChangeBeatmap;
             playButton.Enabled = canChangeBeatmap;