diff --git a/libs/auth/src/angular/login/login.component.html b/libs/auth/src/angular/login/login.component.html
index 1b663b14b5..96ec174ccf 100644
--- a/libs/auth/src/angular/login/login.component.html
+++ b/libs/auth/src/angular/login/login.component.html
@@ -174,7 +174,13 @@
     <!-- Email Address input -->
     <bit-form-field>
       <bit-label>{{ "emailAddress" | i18n }}</bit-label>
-      <input type="email" formControlName="email" bitInput appAutofocus />
+      <input
+        type="email"
+        formControlName="email"
+        bitInput
+        appAutofocus
+        (keyup.enter)="continue()"
+      />
     </bit-form-field>
 
     <!-- Remember Email input -->
@@ -185,7 +191,7 @@
 
     <div class="tw-grid tw-gap-3">
       <!-- Continue button -->
-      <button type="submit" bitButton buttonType="primary" (click)="validateEmail()">
+      <button type="submit" bitButton buttonType="primary" (click)="continue()">
         <span> {{ "continue" | i18n }} </span>
       </button>
 
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index 93aba2815f..53006297c1 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -351,6 +351,21 @@ export class LoginComponentV2 implements OnInit, OnDestroy {
     await this.loginEmailService.saveEmailSettings();
   }
 
+  protected async continue(): Promise<void> {
+    await this.validateEmail();
+
+    if (!this.formGroup.controls.email.valid) {
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccured"),
+        message: this.i18nService.t("invalidEmail"),
+      });
+      return;
+    }
+
+    this.focusInput();
+  }
+
   private async getLoginWithDevice(email: string): Promise<void> {
     try {
       const deviceIdentifier = await this.appIdService.getAppId();