diff --git a/apps/browser/src/popup/accounts/login.component.html b/apps/browser/src/popup/accounts/login.component.html
index f2b7f522ec..76bd1fff14 100644
--- a/apps/browser/src/popup/accounts/login.component.html
+++ b/apps/browser/src/popup/accounts/login.component.html
@@ -16,6 +16,7 @@
               class="monospaced"
               formControlName="masterPassword"
               appInputVerbatim
+              appAutofocus
             />
           </div>
           <div class="action-buttons">
diff --git a/apps/desktop/src/app/accounts/login.component.ts b/apps/desktop/src/app/accounts/login.component.ts
index 43909423ee..db77a78310 100644
--- a/apps/desktop/src/app/accounts/login.component.ts
+++ b/apps/desktop/src/app/accounts/login.component.ts
@@ -156,6 +156,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy {
       );
       return;
     }
+    this.focusInput();
   }
 
   async submit() {
@@ -169,4 +170,9 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy {
       content.setAttribute("style", "width:335px");
     }
   }
+
+  private focusInput() {
+    const email = this.loggedEmail;
+    document.getElementById(email == null || email === "" ? "email" : "masterPassword").focus();
+  }
 }
diff --git a/libs/angular/src/components/login.component.ts b/libs/angular/src/components/login.component.ts
index 6d4b6966bb..0b35b827af 100644
--- a/libs/angular/src/components/login.component.ts
+++ b/libs/angular/src/components/login.component.ts
@@ -275,9 +275,4 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
       this.showLoginWithDevice = false;
     }
   }
-
-  protected focusInput() {
-    const email = this.loggedEmail;
-    document.getElementById(email == null || email === "" ? "email" : "masterPassword").focus();
-  }
 }