diff --git a/osu-framework b/osu-framework
index 39aae99f5c..b963ce8250 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 39aae99f5c21ac9c9f8003cb4dedea345c38c78c
+Subproject commit b963ce82505bc953db0a0763679e1ec80a060811
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 7406a9ec4f..ffe1560627 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Overlays.KeyBinding
             return true;
         }
 
-        protected override bool OnWheel(InputState state)
+        protected override bool OnScroll(InputState state)
         {
             if (HasFocus)
             {
@@ -192,7 +192,7 @@ namespace osu.Game.Overlays.KeyBinding
                 }
             }
 
-            return base.OnWheel(state);
+            return base.OnScroll(state);
         }
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index be08fffc77..b71d3aee18 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -182,9 +182,9 @@ namespace osu.Game.Screens.Edit
             LoadComponentAsync(currentScreen, screenContainer.Add);
         }
 
-        protected override bool OnWheel(InputState state)
+        protected override bool OnScroll(InputState state)
         {
-            if (state.Mouse.WheelDelta > 0)
+            if (state.Mouse.ScrollDelta.X + state.Mouse.ScrollDelta.Y > 0)
                 clock.SeekBackward(true);
             else
                 clock.SeekForward(true);
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
index 83aa86ba61..2902e74e00 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
@@ -123,15 +123,15 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
         /// </summary>
         private float? localZoomTarget;
 
-        protected override bool OnWheel(InputState state)
+        protected override bool OnScroll(InputState state)
         {
             if (!state.Keyboard.ControlPressed)
-                return base.OnWheel(state);
+                return base.OnScroll(state);
 
             relativeContentZoomTarget = Content.ToLocalSpace(state.Mouse.NativeState.Position).X / Content.DrawSize.X;
             localZoomTarget = ToLocalSpace(state.Mouse.NativeState.Position).X;
 
-            Zoom += state.Mouse.WheelDelta;
+            Zoom += state.Mouse.ScrollDelta.Y;
 
             return true;
         }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9985a24cab..c93e4b7b40 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -364,7 +364,7 @@ namespace osu.Game.Screens.Play
             Background?.FadeTo(1f, fade_out_duration);
         }
 
-        protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !pauseContainer.IsPaused;
+        protected override bool OnScroll(InputState state) => mouseWheelDisabled.Value && !pauseContainer.IsPaused;
 
         private void initializeStoryboard(bool asyncLoad)
         {
diff --git a/osu.Game/Tests/Visual/EditorClockTestCase.cs b/osu.Game/Tests/Visual/EditorClockTestCase.cs
index 85d3684530..1ce7023be0 100644
--- a/osu.Game/Tests/Visual/EditorClockTestCase.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestCase.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Tests.Visual
             Clock.ProcessFrame();
         }
 
-        protected override bool OnWheel(InputState state)
+        protected override bool OnScroll(InputState state)
         {
-            if (state.Mouse.WheelDelta > 0)
+            if (state.Mouse.ScrollDelta.Y > 0)
                 Clock.SeekBackward(true);
             else
                 Clock.SeekForward(true);