diff --git a/OpenRA.Mods.Common/Widgets/HotkeyEntryWidget.cs b/OpenRA.Mods.Common/Widgets/HotkeyEntryWidget.cs
index afed6b72d5..9d9ff634d6 100644
--- a/OpenRA.Mods.Common/Widgets/HotkeyEntryWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/HotkeyEntryWidget.cs
@@ -81,6 +81,8 @@ namespace OpenRA.Mods.Common.Widgets
 
 			Key = Hotkey.FromKeyInput(e);
 
+			YieldKeyboardFocus();
+
 			return true;
 		}