From d2dab50942ae3ad9fd96a49d11382f0f1724eb1e Mon Sep 17 00:00:00 2001
From: SimpleStation14 <Unknown>
Date: Fri, 3 May 2024 11:55:55 -0400
Subject: [PATCH] Cherry-picked commit f7a1ffd0aab25d70ac185753d596469fc1e87480
 from space-wizards/space-station-14/master

---
 Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs | 2 +-
 Resources/keybinds.yml                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index ce5cf421aef..f0537079b97 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -403,7 +403,7 @@ private void InputManagerOnFirstChanceOnKeyEvent(KeyEventArgs keyEvent, KeyEvent
                 Mod1 = mods[0],
                 Mod2 = mods[1],
                 Mod3 = mods[2],
-                Priority = 0,
+                Priority = _currentlyRebinding.Binding?.Priority ?? 0,
                 Type = bindType,
                 CanFocus = key == Keyboard.Key.MouseLeft
                            || key == Keyboard.Key.MouseRight
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index b8cfc40c1c4..346156159a7 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -167,6 +167,7 @@ binds:
   type: State
   key: MouseLeft
   canFocus: true
+  priority: 10
 - function: RotateStoredItem
   type: State
   key: MouseRight