diff --git a/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs
index 89b4c91bae..c46050a995 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs
@@ -113,6 +113,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				passwordField.IsVisible = () => orderManager.AuthenticationFailed;
 				var passwordLabel = widget.Get<LabelWidget>("PASSWORD_LABEL");
 				passwordLabel.IsVisible = passwordField.IsVisible;
+				passwordField.OnEnterKey = () => { retryButton.OnClick(); return true; };
+				passwordField.OnEscKey = () => { abortButton.OnClick(); return true; };
 			}
 
 			passwordOffsetAdjusted = false;