diff --git a/src/popup/vault/add-edit.component.ts b/src/popup/vault/add-edit.component.ts
index baa4745355..d6f5bd7339 100644
--- a/src/popup/vault/add-edit.component.ts
+++ b/src/popup/vault/add-edit.component.ts
@@ -75,22 +75,13 @@ export class AddEditComponent extends BaseAddEditComponent {
             await this.load();
 
             if (!this.editMode || this.cloneMode) {
-                if (params.name && (this.cipher.name == null || this.cipher.name === '')) {
-                    if (this.popupUtilsService.inPopout(window)) {
-                        this.cipher.name = '';
-                    }
-                    else {
-                        this.cipher.name = params.name;
-                    }
-
+                if (!this.popupUtilsService.inPopout(window) && params.name &&
+                    (this.cipher.name == null || this.cipher.name === '')) {
+                    this.cipher.name = params.name;
                 }
-                if (params.uri && (this.cipher.login.uris[0].uri == null || this.cipher.login.uris[0].uri === '')) {
-                    if (this.popupUtilsService.inPopout(window)) {
-                        this.cipher.login.uris[0].uri = '';
-                    }
-                    else {
-                        this.cipher.login.uris[0].uri = params.uri;
-                    }
+                if (!this.popupUtilsService.inPopout(window) && params.uri &&
+                    (this.cipher.login.uris[0].uri == null || this.cipher.login.uris[0].uri === '')) {
+                    this.cipher.login.uris[0].uri = params.uri;
                 }
             }
             if (queryParamsSub != null) {