diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs
index 3747ba67f9..1cb5137998 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs
@@ -227,7 +227,7 @@ namespace OpenRA.Mods.Common.Widgets
 								continue;
 
 							// Event is not valid for this button
-							if (e.Event == KeyInputEvent.Up && !keyUpButtons.Contains(b))
+							if (!(b.DisableKeyRepeat ^ e.IsRepeat) || (e.Event == KeyInputEvent.Up && !keyUpButtons.Contains(b)))
 								continue;
 
 							b.OnKeyPress(e);