diff --git a/osu-framework b/osu-framework
index f807997301..fac688633b 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit f8079973011b54e84e5c0e677fe2b56e55947666
+Subproject commit fac688633b8fcf34ae5d0514c26b03e217161eb4
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index e80a469f91..27ce8d5ed4 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -223,6 +223,26 @@ protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
             return true;
         }
 
+        protected override bool OnJoystickPress(InputState state, Framework.Input.JoystickEventArgs args)
+        {
+            if (!HasFocus)
+                return false;
+
+            bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(state));
+            finalise();
+
+            return true;
+        }
+
+        protected override bool OnJoystickRelease(InputState state, Framework.Input.JoystickEventArgs args)
+        {
+            if (!HasFocus)
+                return base.OnJoystickRelease(state, args);
+
+            finalise();
+            return true;
+        }
+
         private void finalise()
         {
             if (bindTarget != null)