diff --git a/osu.Desktop.VisualTests/VisualTestGame.cs b/osu.Desktop.VisualTests/VisualTestGame.cs
index e0d168390b..5c5bcd9e21 100644
--- a/osu.Desktop.VisualTests/VisualTestGame.cs
+++ b/osu.Desktop.VisualTests/VisualTestGame.cs
@@ -29,7 +29,7 @@ namespace osu.Desktop.VisualTests
             host.DrawThread.InactiveHz = host.DrawThread.ActiveHz;
             host.InputThread.InactiveHz = host.InputThread.ActiveHz;
 
-            host.Window.CursorState = CursorState.Hidden;
+            host.Window.CursorState |= CursorState.Hidden;
         }
     }
 }
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index c2bb39ac4a..299f64d998 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -43,7 +43,7 @@ namespace osu.Desktop
             var desktopWindow = host.Window as DesktopGameWindow;
             if (desktopWindow != null)
             {
-                desktopWindow.CursorState = CursorState.Hidden;
+                desktopWindow.CursorState |= CursorState.Hidden;
 
                 desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
                 desktopWindow.Title = Name;
diff --git a/osu.Game/Configuration/ConfineMouseMode.cs b/osu.Game/Configuration/ConfineMouseMode.cs
deleted file mode 100644
index 527f26cf6b..0000000000
--- a/osu.Game/Configuration/ConfineMouseMode.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-namespace osu.Game.Configuration
-{
-    public enum ConfineMouseMode
-    {
-        Never,
-        Fullscreen,
-        Always
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs b/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
index 4a48c9ec86..27b8159d63 100644
--- a/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
@@ -2,7 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Input;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
@@ -13,44 +15,44 @@ namespace osu.Game.Overlays.Options.Sections.Input
         protected override string Header => "Mouse";
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
             Children = new Drawable[]
             {
                 new OptionSlider<double, SensitivitySlider>
                 {
                     LabelText = "Sensitivity",
-                    Bindable = config.GetBindable<double>(OsuConfig.MouseSpeed)
+                    Bindable = osuConfig.GetBindable<double>(OsuConfig.MouseSpeed)
                 },
                 new OsuCheckbox
                 {
                     LabelText = "Raw input",
-                    Bindable = config.GetBindable<bool>(OsuConfig.RawInput)
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.RawInput)
                 },
                 new OsuCheckbox
                 {
                     LabelText = "Map absolute raw input to the osu! window",
-                    Bindable = config.GetBindable<bool>(OsuConfig.AbsoluteToOsuWindow)
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.AbsoluteToOsuWindow)
                 },
                 new OptionEnumDropdown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor",
-                    Bindable = config.GetBindable<ConfineMouseMode>(OsuConfig.ConfineMouse),
+                    Bindable = config.GetBindable<ConfineMouseMode>(FrameworkConfig.ConfineMouseMode),
                 },
                 new OsuCheckbox
                 {
-                    LabelText = "Disable mouse wheel in play mode",
-                    Bindable = config.GetBindable<bool>(OsuConfig.MouseDisableWheel)
+                    LabelText = "Disable mouse wheel during gameplay",
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.MouseDisableWheel)
                 },
                 new OsuCheckbox
                 {
-                    LabelText = "Disable mouse buttons in play mode",
-                    Bindable = config.GetBindable<bool>(OsuConfig.MouseDisableButtons)
+                    LabelText = "Disable mouse buttons during gameplay",
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.MouseDisableButtons)
                 },
                 new OsuCheckbox
                 {
                     LabelText = "Cursor ripples",
-                    Bindable = config.GetBindable<bool>(OsuConfig.CursorRipple)
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.CursorRipple)
                 },
             };
         }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fb364ccdf5..7b034c2838 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -385,7 +385,6 @@
     <Compile Include="Configuration\ScoreMeterType.cs" />
     <Compile Include="Configuration\ReleaseStream.cs" />
     <Compile Include="Configuration\ScreenshotFormat.cs" />
-    <Compile Include="Configuration\ConfineMouseMode.cs" />
     <Compile Include="Graphics\OsuColour.cs" />
     <Compile Include="Screens\Select\FilterControl.cs" />
     <Compile Include="Screens\Select\SearchTextBox.cs" />