diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 66a78640c6..370e8ccbda 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -6,12 +6,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Settings.Sections;
 using osu.Game.Rulesets.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -44,8 +42,9 @@ namespace osu.Game.Rulesets.Edit
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(RightSideToolboxContainer = new ExpandingToolboxContainer
+            AddInternal(RightSideToolboxContainer = new ExpandingToolboxContainer(130, 250)
             {
+                Padding = new MarginPadding { Right = 10 },
                 Alpha = DistanceSpacingMultiplier.Disabled ? 0 : 1,
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
@@ -154,19 +153,5 @@ namespace osu.Game.Rulesets.Edit
 
             return DurationToDistance(referenceObject, snappedEndTime - startTime);
         }
-
-        protected class ExpandingToolboxContainer : ExpandingContainer
-        {
-            protected override double HoverExpansionDelay => 250;
-
-            public ExpandingToolboxContainer()
-                : base(130, 250)
-            {
-                RelativeSizeAxes = Axes.Y;
-                Padding = new MarginPadding { Left = 10 };
-
-                FillFlow.Spacing = new Vector2(10);
-            }
-        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs b/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs
new file mode 100644
index 0000000000..e807dbd482
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs
@@ -0,0 +1,34 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public class ExpandingToolboxContainer : ExpandingContainer
+    {
+        protected override double HoverExpansionDelay => 250;
+
+        public ExpandingToolboxContainer(float contractedWidth, float expandedWidth)
+            : base(contractedWidth, expandedWidth)
+        {
+            RelativeSizeAxes = Axes.Y;
+
+            FillFlow.Spacing = new Vector2(10);
+        }
+
+        protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => base.ReceivePositionalInputAtSubTree(screenSpacePos) && anyToolboxHovered(screenSpacePos);
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) && anyToolboxHovered(screenSpacePos);
+
+        private bool anyToolboxHovered(Vector2 screenSpacePos) => FillFlow.Children.Any(d => d.ScreenSpaceDrawQuad.Contains(screenSpacePos));
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index a235a5bc60..1c388fe68f 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -13,7 +13,6 @@ using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
@@ -115,8 +114,9 @@ namespace osu.Game.Rulesets.Edit
                                               .WithChild(BlueprintContainer = CreateBlueprintContainer())
                     }
                 },
-                new LeftToolboxFlow
+                new ExpandingToolboxContainer(80, 200)
                 {
+                    Padding = new MarginPadding { Left = 10 },
                     Children = new Drawable[]
                     {
                         new EditorToolboxGroup("toolbox (1-9)")
@@ -382,18 +382,6 @@ namespace osu.Game.Rulesets.Edit
         }
 
         #endregion
-
-        private class LeftToolboxFlow : ExpandingButtonContainer
-        {
-            public LeftToolboxFlow()
-                : base(80, 200)
-            {
-                RelativeSizeAxes = Axes.Y;
-                Padding = new MarginPadding { Right = 10 };
-
-                FillFlow.Spacing = new Vector2(10);
-            }
-        }
     }
 
     /// <summary>