diff --git a/osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs
index 5d2991ca7d..9fc5896ccd 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs
@@ -51,7 +51,7 @@ private void load(OsuColour colours)
                     {
                         new Drawable[]
                         {
-                            new TickSliderBar(beatDivisor, 1, 2, 3, 4, 6, 8, 12, 16)
+                            new TickSliderBar(beatDivisor, BindableBeatDivisor.VALID_DIVISORS)
                             {
                                 RelativeSizeAxes = Axes.Both,
                             }
@@ -216,11 +216,10 @@ protected override void UpdateValue(float value)
             {
             }
 
+            public override bool HandleKeyboardInput => IsHovered && !CurrentNumber.Disabled;
+
             protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
             {
-                if (!IsHovered || CurrentNumber.Disabled)
-                    return false;
-
                 switch (args.Key)
                 {
                     case Key.Right: