diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 9cba07e267..4406cc055d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -22,9 +22,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public event Action OperationStarted;
         public event Action OperationEnded;
 
-        internal event Action HoverGained;
-        internal event Action HoverLost;
-
         private Circle circle;
 
         /// <summary>
@@ -62,14 +59,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override bool OnHover(HoverEvent e)
         {
             UpdateHoverState();
-            HoverGained?.Invoke();
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            base.OnHoverLost(e);
-            HoverLost?.Invoke();
             UpdateHoverState();
         }
 
@@ -89,7 +83,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             HandlingMouse = false;
             UpdateHoverState();
-            base.OnMouseUp(e);
         }
 
         protected virtual void UpdateHoverState()
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index d7e58df748..ed7c451b7e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -29,5 +29,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
             UpdateHoverState();
             base.OnDragEnd(e);
         }
+
+        #region Internal events for SelectionBoxDragHandleContainer
+
+        internal event Action HoverGained;
+        internal event Action HoverLost;
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            bool result = base.OnHover(e);
+            HoverGained?.Invoke();
+            return result;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            HoverLost?.Invoke();
+        }
+
+        #endregion
     }
 }