diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b38b0291e8..c138808890 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -262,14 +262,6 @@ namespace osu.Game.Rulesets.Edit
                                       .Select(t => new HitObjectCompositionToolButton(t, () => toolSelected(t)))
                                       .ToList();
 
-            foreach (var item in toolboxCollection.Items)
-            {
-                item.Selected.DisabledChanged += isDisabled =>
-                {
-                    item.TooltipText = isDisabled ? "Add at least one timing point first!" : ((HitObjectCompositionToolButton)item).TooltipText;
-                };
-            }
-
             togglesCollection.AddRange(CreateTernaryButtons().ToArray());
 
             sampleBankTogglesCollection.AddRange(BlueprintContainer.SampleBankTernaryStates);
diff --git a/osu.Game/Rulesets/Edit/HitObjectCompositionToolButton.cs b/osu.Game/Rulesets/Edit/HitObjectCompositionToolButton.cs
index 641d60dbd3..65a0fb983a 100644
--- a/osu.Game/Rulesets/Edit/HitObjectCompositionToolButton.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectCompositionToolButton.cs
@@ -16,7 +16,10 @@ namespace osu.Game.Rulesets.Edit
         {
             Tool = tool;
 
-            TooltipText = tool.TooltipText;
+            Selected.BindDisabledChanged(isDisabled =>
+            {
+                TooltipText = isDisabled ? "Add at least one timing point first!" : Tool.TooltipText;
+            }, true);
         }
     }
 }