diff --git a/src/angular/components/lock.component.ts b/src/angular/components/lock.component.ts
index 26d1cb9f5d..37f2f72603 100644
--- a/src/angular/components/lock.component.ts
+++ b/src/angular/components/lock.component.ts
@@ -92,7 +92,7 @@ export class LockComponent implements OnInit {
     togglePassword() {
         this.platformUtilsService.eventTrack('Toggled Master Password on Unlock');
         this.showPassword = !this.showPassword;
-        document.getElementById('masterPassword').focus();
+        document.getElementById(this.pinLock ? 'pin' : 'masterPassword').focus();
     }
 
     private async setKeyAndContinue(key: SymmetricCryptoKey) {