diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
index 78c784b083..4e3d9fb17d 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
@@ -22,6 +22,7 @@
         }"
         [attr.data-testid]="field.value.name + '-entry'"
         cdkDrag
+        [cdkDragDisabled]="!canEdit(field.value.type)"
         #customFieldRow
       >
         <!-- Text Field -->
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index e3612e75a1..12e83b052b 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -150,7 +150,9 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
   canEdit(type: FieldType): boolean {
     return (
       !this.isPartialEdit &&
-      (type !== FieldType.Hidden || this.cipherFormContainer.originalCipherView?.viewPassword)
+      (type !== FieldType.Hidden ||
+        this.cipherFormContainer.originalCipherView === null ||
+        this.cipherFormContainer.originalCipherView.viewPassword)
     );
   }