diff --git a/src/auth/ha-auth-flow.js b/src/auth/ha-auth-flow.js
index e2770eee22..d398161635 100644
--- a/src/auth/ha-auth-flow.js
+++ b/src/auth/ha-auth-flow.js
@@ -48,6 +48,17 @@ class HaAuthFlow extends EventsMixin(PolymerElement) {
       _step: Object,
     };
   }
+
+  async ready() {
+    super.ready();
+
+    this.addEventListener('keypress', (ev) => {
+      if (ev.keyCode === 13) {
+        this._handleSubmit();
+      }
+    });
+  }
+
   connectedCallback() {
     super.connectedCallback();