diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 4be66b85..4adbfbc5 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -13,7 +13,7 @@
                 </div>
                 <div class="box-content-row" appBoxRow>
                     <label for="name">{{'name' | i18n}}</label>
-                    <input id="name" type="text" name="Name" [(ngModel)]="cipher.name">
+                    <input id="name" type="text" name="Name" [(ngModel)]="cipher.name" [appAutofocus]="!editMode">
                 </div>
                 <!-- Login -->
                 <div *ngIf="cipher.type === cipherType.Login">