diff --git a/frontend/src/components/ListBulkActions.vue b/frontend/src/components/ListBulkActions.vue
index 6b54b15d..5b5bfdaa 100644
--- a/frontend/src/components/ListBulkActions.vue
+++ b/frontend/src/components/ListBulkActions.vue
@@ -1,16 +1,17 @@
 <template>
   <EditValueModal
+    v-if="showEditModal"
     v-model="showEditModal"
     :doctype="doctype"
     :selectedValues="selectedValues"
     @reload="reload"
   />
   <AssignmentModal
-    v-if="selectedValues"
-    :docs="selectedValues"
-    :doctype="doctype"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="bulkAssignees"
+    :docs="selectedValues"
+    :doctype="doctype"
     @reload="reload"
   />
 </template>
diff --git a/frontend/src/components/Modals/AssignmentModal.vue b/frontend/src/components/Modals/AssignmentModal.vue
index 0e1a9682..0028e8f7 100644
--- a/frontend/src/components/Modals/AssignmentModal.vue
+++ b/frontend/src/components/Modals/AssignmentModal.vue
@@ -85,8 +85,8 @@ const props = defineProps({
     default: null,
   },
   docs: {
-    type: Array,
-    default: () => [],
+    type: Set,
+    default: new Set(),
   },
   doctype: {
     type: String,
diff --git a/frontend/src/components/Modals/EditValueModal.vue b/frontend/src/components/Modals/EditValueModal.vue
index 43540602..039f4eca 100644
--- a/frontend/src/components/Modals/EditValueModal.vue
+++ b/frontend/src/components/Modals/EditValueModal.vue
@@ -52,7 +52,7 @@ const props = defineProps({
     required: true,
   },
   selectedValues: {
-    type: Array,
+    type: Set,
     required: true,
   },
 })
@@ -67,6 +67,9 @@ const fields = createResource({
   params: {
     doctype: props.doctype,
   },
+  transform: (data) => {
+    return data.filter((f) => f.hidden == 0 && f.read_only == 0)
+  }
 })
 
 onMounted(() => {
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index a3e292dd..bbf63456 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -278,11 +278,11 @@
     }"
   />
   <AssignmentModal
-    v-if="deal.data"
-    :doc="deal.data"
-    doctype="CRM Deal"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="deal.data._assignedTo"
+    :doc="deal.data"
+    doctype="CRM Deal"
   />
 </template>
 <script setup>
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index cddfdab9..dccf8a47 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -185,11 +185,11 @@
     </Resizer>
   </div>
   <AssignmentModal
-    v-if="lead.data"
-    :doc="lead.data"
-    doctype="CRM Lead"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="lead.data._assignedTo"
+    :doc="lead.data"
+    doctype="CRM Lead"
   />
   <Dialog
     v-model="showConvertToDealModal"
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index 182b7219..fb6ba895 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -237,11 +237,11 @@
     }"
   />
   <AssignmentModal
-    v-if="deal.data"
-    :doc="deal.data"
-    doctype="CRM Deal"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="deal.data._assignedTo"
+    :doc="deal.data"
+    doctype="CRM Deal"
   />
 </template>
 <script setup>
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index 76212e12..4ebd15f0 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -96,11 +96,11 @@
     </Tabs>
   </div>
   <AssignmentModal
-    v-if="lead.data"
-    :doc="lead.data"
-    doctype="CRM Lead"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="lead.data._assignedTo"
+    :doc="lead.data"
+    doctype="CRM Lead"
   />
   <Dialog
     v-model="showConvertToDealModal"