diff --git a/osu.Game.Rulesets.Osu/Edit/GridFromPointsTool.cs b/osu.Game.Rulesets.Osu/Edit/GridFromPointsTool.cs
index 722d9d1303..9bbeeaafc3 100644
--- a/osu.Game.Rulesets.Osu/Edit/GridFromPointsTool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/GridFromPointsTool.cs
@@ -22,6 +22,13 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private Vector2? startPosition;
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            gridToolboxGroup.GridFromPointsClicked += BeginPlacement;
+        }
+
         public void BeginPlacement()
         {
             IsPlacing = true;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index e035317194..cd5c4f4ba9 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private Bindable<HitObject> placementObject;
 
+        private GridFromPointsTool gridFromPointsTool;
+
         [Cached(typeof(IDistanceSnapProvider))]
         protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
 
@@ -99,7 +101,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             updateDistanceSnapGrid();
 
             OsuGridToolboxGroup.GridType.BindValueChanged(updatePositionSnapGrid, true);
-            OsuGridToolboxGroup.GridFromPointsClicked += () => gridFromPointsTool.BeginPlacement();
 
             LayerAboveRuleset.Add(
                 // Place it above the playfield and blueprints, so it takes priority when handling input.
@@ -118,8 +119,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             );
         }
 
-        private GridFromPointsTool gridFromPointsTool;
-
         private void updatePositionSnapGrid(ValueChangedEvent<PositionSnapGridType> obj)
         {
             if (positionSnapGrid != null)