diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index fb86cb4a01..73da837d03 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -81,24 +81,21 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
-            base.OnKeyDown(e);
-
-            if (cumulativeRotation.Value != null && (e.Key == Key.ShiftLeft || e.Key == Key.ShiftRight))
+            if (IsDragged && (e.Key == Key.ShiftLeft || e.Key == Key.ShiftRight))
             {
                 applyRotation(shouldSnap: true);
+                return true;
             }
 
-            return true;
+            return base.OnKeyDown(e);
         }
 
         protected override void OnKeyUp(KeyUpEvent e)
         {
             base.OnKeyUp(e);
 
-            if (cumulativeRotation.Value != null && (e.Key == Key.ShiftLeft || e.Key == Key.ShiftRight))
-            {
+            if (IsDragged && (e.Key == Key.ShiftLeft || e.Key == Key.ShiftRight))
                 applyRotation(shouldSnap: false);
-            }
         }
 
         protected override void OnDragEnd(DragEndEvent e)