diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index a1b40ae7944..bd11fca90ea 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -251,7 +251,7 @@
                     <input id="favorite" type="checkbox" name="Favorite" [(ngModel)]="cipher.favorite">
                 </div>
                 <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
-                    (click)="attachments()" *ngIf="editMode && showAttachments">
+                    (click)="attachments()" *ngIf="editMode && showAttachments && !cloneMode">
                     <div class="row-main">{{'attachments' | i18n}}</div>
                     <i class="fa fa-chevron-right row-sub-icon" aria-hidden="true"></i>
                 </a>
@@ -376,4 +376,4 @@
             </div>
         </div>
     </content>
-</form>
+</form>
\ No newline at end of file
diff --git a/src/popup/vault/add-edit.component.ts b/src/popup/vault/add-edit.component.ts
index a588042a58d..85c0da350ad 100644
--- a/src/popup/vault/add-edit.component.ts
+++ b/src/popup/vault/add-edit.component.ts
@@ -64,7 +64,7 @@ export class AddEditComponent extends BaseAddEditComponent {
             }
             await this.load();
 
-            if (!this.editMode) {
+            if (!this.editMode || this.cloneMode) {
                 if (params.name && (this.cipher.name == null || this.cipher.name === '')) {
                     this.cipher.name = params.name;
                 }