diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 3be4dd8c0b..fd58b1db5b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -285,7 +285,7 @@ protected virtual void ExitFromBack()
 
         public void Edit(BeatmapInfo beatmap = null)
         {
-            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
+           Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
            this.Push(new Editor());
         }
 
@@ -510,14 +510,17 @@ public override void OnSuspending(IScreen next)
 
         public override bool OnExiting(IScreen next)
         {
+            if (base.OnExiting(next))
+                return true;
+
+            Logger.Log("Exiting song select!");
+
             if (ModSelect.State == Visibility.Visible)
             {
                 ModSelect.Hide();
                 return true;
             }
 
-            FinaliseSelection(performStartAction: false);
-
             beatmapInfoWedge.State = Visibility.Hidden;
 
             this.FadeOut(100);
@@ -530,7 +533,7 @@ public override bool OnExiting(IScreen next)
             SelectedMods.UnbindAll();
             Beatmap.Value.Mods.Value = new Mod[] { };
 
-            return base.OnExiting(next);
+            return false;
         }
 
         protected override void Dispose(bool isDisposing)