diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index 035fafea..7b082a3a 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -208,7 +208,7 @@ async function updateTask() {
 function render() {
   editMode.value = false
   nextTick(() => {
-    title.value.el.focus()
+    title.value?.el?.focus?.()
     _task.value = { ...props.task }
     if (_task.value.title) {
       editMode.value = true
diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index ceff66e4..53e69cb2 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -237,12 +237,14 @@
     :defaults="defaults"
   />
   <NoteModal
+    v-if="showNoteModal"
     v-model="showNoteModal"
     :note="note"
     doctype="CRM Deal"
     :doc="docname"
   />
   <TaskModal
+    v-if="showTaskModal"
     v-model="showTaskModal"
     :task="task"
     doctype="CRM Deal"
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index 097b4ac2..599f6634 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -263,12 +263,14 @@
     :defaults="defaults"
   />
   <NoteModal
+    v-if="showNoteModal"
     v-model="showNoteModal"
     :note="note"
     doctype="CRM Lead"
     :doc="docname"
   />
   <TaskModal
+    v-if="showTaskModal"
     v-model="showTaskModal"
     :task="task"
     doctype="CRM Lead"