diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index c7ac232f58..bc6d26135b 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -35,9 +36,7 @@ using osu.Game.Screens.Edit.Design;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Screens.Edit.Verify;
-using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Select;
 using osu.Game.Users;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -77,6 +76,9 @@ namespace osu.Game.Screens.Edit
 
         private Container<EditorScreen> screenContainer;
 
+        [CanBeNull]
+        private readonly EditorLoader loader;
+
         private EditorScreen currentScreen;
 
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
@@ -106,6 +108,11 @@ namespace osu.Game.Screens.Edit
         [Resolved(CanBeNull = true)]
         private OsuGame game { get; set; }
 
+        public Editor(EditorLoader loader = null)
+        {
+            this.loader = loader;
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, OsuConfigManager config)
         {
@@ -730,12 +737,14 @@ namespace osu.Game.Screens.Edit
             {
                 menuItem.Action.Value = () =>
                 {
+                    if (loader != null)
+                        loader.ValidForResume = true;
+
                     game?.PerformFromScreen(screen =>
                     {
-                        var osuScreen = (OsuScreen)screen;
-                        osuScreen.Beatmap.Value = beatmapManager.GetWorkingBeatmap(b);
-                        screen.Push(new Editor());
-                    }, new[] { typeof(MainMenu), typeof(SongSelect) });
+                        if (screen != null && screen == loader)
+                            loader.PushEditor();
+                    }, new[] { typeof(EditorLoader) });
                 };
             }
 
diff --git a/osu.Game/Screens/Edit/EditorLoader.cs b/osu.Game/Screens/Edit/EditorLoader.cs
new file mode 100644
index 0000000000..5c8d0f5b16
--- /dev/null
+++ b/osu.Game/Screens/Edit/EditorLoader.cs
@@ -0,0 +1,27 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Screens;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Screens.Edit
+{
+    /// <summary>
+    /// Transition screen for the editor.
+    /// Used to avoid backing out to main menu/song select when switching difficulties from within the editor.
+    /// </summary>
+    public class EditorLoader : ScreenWithBeatmapBackground
+    {
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+            PushEditor();
+        }
+
+        public void PushEditor()
+        {
+            this.Push(new Editor(this));
+            ValidForResume = false;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 1d0182a945..8b2ec43e3e 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Menu
                             OnEdit = delegate
                             {
                                 Beatmap.SetDefault();
-                                this.Push(new Editor());
+                                this.Push(new EditorLoader());
                             },
                             OnSolo = loadSoloSongSelect,
                             OnMultiplayer = () => this.Push(new Multiplayer()),
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index b3d715e580..f11f9fd614 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -349,7 +349,7 @@ namespace osu.Game.Screens.Select
                 throw new InvalidOperationException($"Attempted to edit when {nameof(AllowEditing)} is disabled");
 
             Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
-            this.Push(new Editor());
+            this.Push(new EditorLoader());
         }
 
         /// <summary>