diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
index 8fe381f141..bf9071b812 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
@@ -1,20 +1,44 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneSwitchButton : OsuTestScene
+    public class TestSceneSwitchButton : ManualInputManagerTestScene
     {
-        public TestSceneSwitchButton()
+        private SwitchButton switchButton;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            Child = new SwitchButton
+            Child = switchButton = new SwitchButton
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
+        });
+
+        [Test]
+        public void TestChangeThroughInput()
+        {
+            AddStep("move to switch button", () => InputManager.MoveMouseTo(switchButton));
+            AddStep("click on", () => InputManager.Click(MouseButton.Left));
+            AddStep("click off", () => InputManager.Click(MouseButton.Left));
+        }
+
+        [Test]
+        public void TestChangeThroughBindable()
+        {
+            BindableBool bindable = null;
+
+            AddStep("bind bindable", () => switchButton.Current.BindTo(bindable = new BindableBool()));
+            AddStep("toggle bindable", () => bindable.Toggle());
+            AddStep("toggle bindable", () => bindable.Toggle());
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/SwitchButton.cs b/osu.Game/Graphics/UserInterface/SwitchButton.cs
index 21712051ef..9964af91d5 100644
--- a/osu.Game/Graphics/UserInterface/SwitchButton.cs
+++ b/osu.Game/Graphics/UserInterface/SwitchButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -73,20 +74,20 @@ namespace osu.Game.Graphics.UserInterface
 
             switchContainer.Colour = enabledColour;
             fill.Colour = disabledColour;
-
-            updateBorder();
         }
 
-        protected override void OnUserChange(bool value)
+        protected override void LoadComplete()
         {
-            base.OnUserChange(value);
+            base.LoadComplete();
 
-            if (value)
-                switchCircle.MoveToX(switchContainer.DrawWidth - switchCircle.DrawWidth, 200, Easing.OutQuint);
-            else
-                switchCircle.MoveToX(0, 200, Easing.OutQuint);
+            Current.BindValueChanged(updateState, true);
+            FinishTransforms(true);
+        }
 
-            fill.FadeTo(value ? 1 : 0, 250, Easing.OutQuint);
+        private void updateState(ValueChangedEvent<bool> state)
+        {
+            switchCircle.MoveToX(state.NewValue ? switchContainer.DrawWidth - switchCircle.DrawWidth : 0, 200, Easing.OutQuint);
+            fill.FadeTo(state.NewValue ? 1 : 0, 250, Easing.OutQuint);
 
             updateBorder();
         }