diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 4f0952e4..e3d09fa7 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -23,15 +23,7 @@
       />
       <Dropdown
         v-if="document.doc"
-        :options="
-          statusOptions(
-            'deal',
-            updateStatus,
-            document.statuses?.length
-              ? document.statuses
-              : deal.data._customStatuses,
-          )
-        "
+        :options="statusOptions('deal', document, deal.data._customStatuses)"
       >
         <template #default="{ open }">
           <Button :label="document.doc.status">
@@ -741,9 +733,4 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
-
-function updateStatus(value) {
-  document.doc.status = value
-  document.save.submit()
-}
 </script>
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 8577725b..f722054c 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -23,15 +23,7 @@
       />
       <Dropdown
         v-if="document.doc"
-        :options="
-          statusOptions(
-            'lead',
-            updateStatus,
-            document.statuses?.length
-              ? document.statuses
-              : lead.data._customStatuses,
-          )
-        "
+        :options="statusOptions('lead', document, lead.data._customStatuses)"
       >
         <template #default="{ open }">
           <Button :label="document.doc.status">
@@ -731,9 +723,4 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
-
-function updateStatus(value) {
-  document.doc.status = value
-  document.save.submit()
-}
 </script>
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index ae8fd3bd..71995d88 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -11,15 +11,7 @@
       <div class="absolute right-0">
         <Dropdown
           v-if="document.doc"
-          :options="
-            statusOptions(
-              'deal',
-              updateStatus,
-              document.statuses?.length
-                ? document.statuses
-                : deal.data._customStatuses,
-            )
-          "
+          :options="statusOptions('deal', document, deal.data._customStatuses)"
         >
           <template #default="{ open }">
             <Button :label="document.doc.status">
@@ -627,9 +619,4 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
-
-function updateStatus(value) {
-  document.doc.status = value
-  document.save.submit()
-}
 </script>
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index 532a681a..da7574dd 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -11,15 +11,7 @@
       <div class="absolute right-0">
         <Dropdown
           v-if="document.doc"
-          :options="
-            statusOptions(
-              'lead',
-              updateStatus,
-              document.statuses?.length
-                ? document.statuses
-                : lead.data._customStatuses,
-            )
-          "
+          :options="statusOptions('lead', document, lead.data._customStatuses)"
         >
           <template #default="{ open }">
             <Button :label="document.doc.status">
@@ -476,9 +468,4 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
-
-function updateStatus(value) {
-  document.doc.status = value
-  document.save.submit()
-}
 </script>
diff --git a/frontend/src/stores/statuses.js b/frontend/src/stores/statuses.js
index cf3fdf41..9a63da26 100644
--- a/frontend/src/stores/statuses.js
+++ b/frontend/src/stores/statuses.js
@@ -77,10 +77,14 @@ export const statusesStore = defineStore('crm-statuses', () => {
     return communicationStatuses[name]
   }
 
-  function statusOptions(doctype, action, statuses = []) {
+  function statusOptions(doctype, document, statuses = []) {
     let statusesByName =
       doctype == 'deal' ? dealStatusesByName : leadStatusesByName
 
+    if (document?.statuses?.length) {
+      statuses = document.statuses
+    }
+
     if (statuses.length) {
       statusesByName = statuses.reduce((acc, status) => {
         acc[status] = statusesByName[status]
@@ -96,7 +100,10 @@ export const statusesStore = defineStore('crm-statuses', () => {
         icon: () => h(IndicatorIcon, { class: statusesByName[status]?.color }),
         onClick: () => {
           capture('status_changed', { doctype, status })
-          action && action(statusesByName[status]?.name)
+          if (document) {
+            document.doc.status = statusesByName[status]?.name
+            document.save.submit()
+          }
         },
       })
     }