diff --git a/osu.Game/Screens/Edit/EditorLoader.cs b/osu.Game/Screens/Edit/EditorLoader.cs
index 8798a7964b..499baeec4f 100644
--- a/osu.Game/Screens/Edit/EditorLoader.cs
+++ b/osu.Game/Screens/Edit/EditorLoader.cs
@@ -6,6 +6,7 @@
 using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Menu;
 
 namespace osu.Game.Screens.Edit
@@ -43,10 +44,16 @@ protected override void LogoArriving(OsuLogo logo, bool resuming)
             }
         }
 
-        private void pushEditor()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            this.Push(new Editor(this));
-            ValidForResume = false;
+            AddRangeInternal(new Drawable[]
+            {
+                new LoadingSpinner(true)
+                {
+                    State = { Value = Visibility.Visible },
+                }
+            });
         }
 
         public void ScheduleDifficultySwitch(BeatmapInfo beatmapInfo)
@@ -62,6 +69,12 @@ public void ScheduleDifficultySwitch(BeatmapInfo beatmapInfo)
             });
         }
 
+        private void pushEditor()
+        {
+            this.Push(new Editor(this));
+            ValidForResume = false;
+        }
+
         public void CancelPendingDifficultySwitch()
         {
             scheduledDifficultySwitch?.Cancel();