diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.html b/apps/desktop/src/vault/app/vault/vault-v2.component.html
index f1cb28f3ea5..4a66abaf909 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.html
@@ -35,9 +35,15 @@
             (cipherSaved)="savedCipher($event)"
             [beforeSubmit]="onSubmit"
             [submitBtn]="footer?.submitBtn"
+            (formStatusChange$)="formStatusChanged($event)"
           >
             <bit-item slot="attachment-button">
-              <button bit-item-content type="button" (click)="openAttachmentsDialog()">
+              <button
+                bit-item-content
+                type="button"
+                (click)="openAttachmentsDialog()"
+                [disabled]="formDisabled"
+              >
                 <p class="tw-m-0">
                   {{ "attachments" | i18n }}
                   <span
diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
index b408eb799fd..6472419928e 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
@@ -163,6 +163,9 @@ export class VaultV2Component<C extends CipherViewLike>
   config: CipherFormConfig | null = null;
   isSubmitting = false;
 
+  /** Tracks the status of the edit cipher form */
+  protected formDisabled: boolean = false;
+
   private organizations$: Observable<Organization[]> = this.accountService.activeAccount$.pipe(
     map((a) => a?.id),
     switchMap((id) => this.organizationService.organizations$(id)),
@@ -447,6 +450,10 @@ export class VaultV2Component<C extends CipherViewLike>
     );
   }
 
+  formStatusChanged(status: "disabled" | "enabled") {
+    this.formDisabled = status === "disabled";
+  }
+
   async openAttachmentsDialog() {
     if (!this.userHasPremiumAccess) {
       await this.premiumUpgradePromptService.promptForPremium();