diff --git a/frontend/src/components/Activities/DataFields.vue b/frontend/src/components/Activities/DataFields.vue
index 25feb8e3..e73fb891 100644
--- a/frontend/src/components/Activities/DataFields.vue
+++ b/frontend/src/components/Activities/DataFields.vue
@@ -64,7 +64,7 @@ import LoadingIndicator from '@/components/Icons/LoadingIndicator.vue'
 import { createToast } from '@/utils'
 import { usersStore } from '@/stores/users'
 import { isMobileView } from '@/composables/settings'
-import { ref } from 'vue'
+import { ref, watch } from 'vue'
 
 const props = defineProps({
   doctype: {
@@ -114,4 +114,20 @@ const tabs = createResource({
 function saveChanges() {
   data.save.submit()
 }
+
+watch(
+  () => data.doc,
+  (newValue, oldValue) => {
+    if (!oldValue) return
+    if (newValue && oldValue) {
+      const isDirty =
+        JSON.stringify(newValue) !== JSON.stringify(data.originalDoc)
+      data.isDirty = isDirty
+      if (isDirty) {
+        data.save.loading = false
+      }
+    }
+  },
+  { deep: true },
+)
 </script>
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index eb844696..428997c9 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -267,7 +267,11 @@
       </div>
     </Resizer>
   </div>
-  <ErrorPage v-else :errorTitle="errorTitle" :errorMessage="errorMessage" />
+  <ErrorPage
+    v-else-if="errorTitle"
+    :errorTitle="errorTitle"
+    :errorMessage="errorMessage"
+  />
   <OrganizationModal
     v-model="showOrganizationModal"
     v-model:organization="_organization"
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 19aa6e66..cf6c47a9 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -191,7 +191,11 @@
       </div>
     </Resizer>
   </div>
-  <ErrorPage v-else :errorTitle="errorTitle" :errorMessage="errorMessage" />
+  <ErrorPage
+    v-else-if="errorTitle"
+    :errorTitle="errorTitle"
+    :errorMessage="errorMessage"
+  />
   <Dialog
     v-model="showConvertToDealModal"
     :options="{