diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index f30f92b602..8e845bac05 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -105,9 +105,6 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private MusicController music { get; set; }
 
-        [Resolved(CanBeNull = true)]
-        private OsuGame game { get; set; }
-
         public Editor(EditorLoader loader = null)
         {
             this.loader = loader;
@@ -735,16 +732,12 @@ namespace osu.Game.Screens.Edit
 
         private void switchToDifficulty(BeatmapInfo beatmapInfo)
         {
-            if (loader != null)
-                loader.ValidForResume = true;
+            if (loader == null)
+                return;
 
-            game?.PerformFromScreen(screen =>
-            {
-                if (screen == null || screen != loader)
-                    return;
-
-                loader.PushEditor(beatmapInfo);
-            }, new[] { typeof(EditorLoader) });
+            loader.ValidForResume = true;
+            this.Exit();
+            loader.PushEditor(beatmapInfo);
         }
 
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);
diff --git a/osu.Game/Screens/Edit/EditorLoader.cs b/osu.Game/Screens/Edit/EditorLoader.cs
index 45f2d1bffd..011f40419c 100644
--- a/osu.Game/Screens/Edit/EditorLoader.cs
+++ b/osu.Game/Screens/Edit/EditorLoader.cs
@@ -24,13 +24,13 @@ namespace osu.Game.Screens.Edit
             PushEditor();
         }
 
-        public void PushEditor([CanBeNull] BeatmapInfo beatmapInfo = null)
+        public void PushEditor([CanBeNull] BeatmapInfo beatmapInfo = null) => Schedule(() =>
         {
             if (beatmapInfo != null)
                 Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapInfo);
 
             this.Push(new Editor(this));
             ValidForResume = false;
-        }
+        });
     }
 }