diff --git a/osu-framework b/osu-framework
index 45e75163b2..7ac3dbff36 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 45e75163b272b7aa023afec7801ea079aba4ee69
+Subproject commit 7ac3dbff3615fb410da1e330e6379b53a41292b6
diff --git a/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs b/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
index 986240b37f..567c7a35b1 100644
--- a/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
+++ b/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
@@ -42,14 +42,14 @@ namespace osu.Game.Modes.Osu
             {
                 if (mouseDisabled.Value)
                 {
-                    mouse.PressedButtons.Remove(MouseButton.Left);
-                    mouse.PressedButtons.Remove(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Left, false);
+                    mouse.SetPressed(MouseButton.Right, false);
                 }
 
                 if (leftViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Left);
+                    mouse.SetPressed(MouseButton.Left, true);
                 if (rightViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Right, true);
             }
         }
     }
diff --git a/osu.Game/Modes/Replays/FramedReplayInputHandler.cs b/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
index ae20ece515..0c1e140ce4 100644
--- a/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Modes.Replays
             public ReplayMouseState(Vector2 position, IEnumerable<MouseButton> list)
             {
                 Position = position;
-                list.ForEach(b => PressedButtons.Add(b));
+                list.ForEach(b => SetPressed(b, true));
             }
         }
 
@@ -148,4 +148,4 @@ namespace osu.Game.Modes.Replays
             }
         }
     }
-}
\ No newline at end of file
+}