diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 061009e519..fd5270653d 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -79,11 +79,11 @@ namespace osu.Game.Screens.Edit
 
         private void updateHitObject([CanBeNull] HitObject hitObject, bool silent)
         {
-            scheduledUpdate?.Cancel();
-
             if (hitObject != null)
                 pendingUpdates.Add(hitObject);
 
+            if (scheduledUpdate?.Completed == false) return;
+
             scheduledUpdate = Schedule(() =>
             {
                 beatmapProcessor?.PreProcess();
@@ -158,10 +158,14 @@ namespace osu.Game.Screens.Edit
         {
             trackStartTime(hitObject);
 
-            mutableHitObjects.Insert(index, hitObject);
-
-            HitObjectAdded?.Invoke(hitObject);
             updateHitObject(hitObject, true);
+
+            // must occur after the batch-scheduled ApplyDefaults.
+            Schedule(() =>
+            {
+                mutableHitObjects.Insert(index, hitObject);
+                HitObjectAdded?.Invoke(hitObject);
+            });
         }
 
         /// <summary>