diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index 810fd19549..4023abab42 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -209,6 +209,7 @@ export class AddEditComponent implements OnChanges {
     togglePassword() {
         this.analytics.eventTrack.next({ action: 'Toggled Password on Edit' });
         this.showPassword = !this.showPassword;
+        document.getElementById('loginPassword').focus();
     }
 
     toggleFieldValue(field: FieldView) {