diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index d6e3d378e0..6e1afb6b68 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -54,10 +54,10 @@ namespace osu.Game.Screens.Menu
                         buttons = new ButtonSystem
                         {
                             OnChart = delegate { this.Push(new ChartListing()); },
-                            OnDirect = delegate {this.Push(new OnlineListing()); },
-                            OnEdit = delegate {this.Push(new Editor()); },
+                            OnDirect = delegate { this.Push(new OnlineListing()); },
+                            OnEdit = delegate { this.Push(new Editor()); },
                             OnSolo = onSolo,
-                            OnMulti = delegate {this.Push(new Multiplayer()); },
+                            OnMulti = delegate { this.Push(new Multiplayer()); },
                             OnExit = this.Exit,
                         }
                     }
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Menu
 
         public void LoadToSolo() => Schedule(onSolo);
 
-        private void onSolo() =>this.Push(consumeSongSelect());
+        private void onSolo() => this.Push(consumeSongSelect());
 
         private Screen consumeSongSelect()
         {
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Menu
         {
             base.OnResuming(last);
 
-            ((BackgroundScreenDefault)Background).Next();
+            (Background as BackgroundScreenDefault)?.Next();
 
             //we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Menu
         {
             if (!e.Repeat && e.ControlPressed && e.ShiftPressed && e.Key == Key.D)
             {
-               this.Push(new Drawings());
+                this.Push(new Drawings());
                 return true;
             }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 60fcbc9271..5ecbaf8d1f 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -285,7 +285,7 @@ namespace osu.Game.Screens.Select
 
         public void Edit(BeatmapInfo beatmap = null)
         {
-            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
+           Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
            this.Push(new Editor());
         }
 
@@ -509,14 +509,15 @@ namespace osu.Game.Screens.Select
 
         public override bool OnExiting(IScreen next)
         {
+            if (base.OnExiting(next))
+                return true;
+
             if (ModSelect.State == Visibility.Visible)
             {
                 ModSelect.Hide();
                 return true;
             }
 
-            FinaliseSelection(performStartAction: false);
-
             beatmapInfoWedge.State = Visibility.Hidden;
 
             this.FadeOut(100);
@@ -529,7 +530,7 @@ namespace osu.Game.Screens.Select
             SelectedMods.UnbindAll();
             Beatmap.Value.Mods.Value = new Mod[] { };
 
-            return base.OnExiting(next);
+            return false;
         }
 
         protected override void Dispose(bool isDisposing)