diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index d55ccb4b41..2c6edb64f8 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -385,6 +385,7 @@ namespace osu.Game.Beatmaps
                 setInfo.Beatmaps.Remove(beatmapInfo);
 
                 updateHashAndMarkDirty(setInfo);
+                workingBeatmapCache.Invalidate(setInfo);
             });
         }
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 6e06683e38..3dfc7010f3 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -929,7 +929,7 @@ namespace osu.Game.Screens.Edit
                 // of note, we're still working with the cloned version, so indices are all prior to deletion.
                 BeatmapInfo nextToShow = difficultiesBeforeDeletion[deletedIndex == 0 ? 1 : deletedIndex - 1];
 
-                Beatmap.Value = beatmapManager.GetWorkingBeatmap(nextToShow, true);
+                Beatmap.Value = beatmapManager.GetWorkingBeatmap(nextToShow);
 
                 SwitchToDifficulty(nextToShow);
             }