diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index fd5270653d..5272530228 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObject">The <see cref="HitObject"/> to update.</param>
         public void UpdateHitObject([NotNull] HitObject hitObject) => updateHitObject(hitObject, false);
 
-        private void updateHitObject([CanBeNull] HitObject hitObject, bool silent)
+        private void updateHitObject([CanBeNull] HitObject hitObject, bool silent, bool performAdd = false)
         {
             if (hitObject != null)
                 pendingUpdates.Add(hitObject);
@@ -93,6 +93,12 @@ namespace osu.Game.Screens.Edit
 
                 beatmapProcessor?.PostProcess();
 
+                if (performAdd)
+                {
+                    foreach (var obj in pendingUpdates)
+                        HitObjectAdded?.Invoke(obj);
+                }
+
                 if (!silent)
                 {
                     foreach (var obj in pendingUpdates)
@@ -158,14 +164,8 @@ namespace osu.Game.Screens.Edit
         {
             trackStartTime(hitObject);
 
-            updateHitObject(hitObject, true);
-
-            // must occur after the batch-scheduled ApplyDefaults.
-            Schedule(() =>
-            {
-                mutableHitObjects.Insert(index, hitObject);
-                HitObjectAdded?.Invoke(hitObject);
-            });
+            mutableHitObjects.Insert(index, hitObject);
+            updateHitObject(hitObject, true, true);
         }
 
         /// <summary>