diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index e9fecda9de..ed0d529d84 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -40,7 +40,10 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
     }
 
     async load() {
-        this.cipher = null;
+        if (document.querySelectorAll('app-vault-add-edit .ng-dirty').length === 0 ||
+            (this.cipher != null && this.cipherId !== this.cipher.id)) {
+            this.cipher = null;
+        }
         super.load();
     }
 }