diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index 153184f41..00233df7e 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -47,7 +47,7 @@
         </div>
         <div class="flex flex-wrap items-center gap-2">
           <Dropdown :options="taskStatusOptions(updateTaskStatus)">
-            <Button :label="_task.status" class="justify-between w-full">
+            <Button :label="_task.status">
               <template #prefix>
                 <TaskStatusIcon :status="_task.status" />
               </template>
@@ -88,7 +88,7 @@
             />
           </div>
           <Dropdown :options="taskPriorityOptions(updateTaskPriority)">
-            <Button :label="_task.priority" class="justify-between w-full">
+            <Button :label="_task.priority">
               <template #prefix>
                 <TaskPriorityIcon :priority="_task.priority" />
               </template>
diff --git a/frontend/src/pages/Notes.vue b/frontend/src/pages/Notes.vue
index 9d5aa03d6..40fc4c577 100644
--- a/frontend/src/pages/Notes.vue
+++ b/frontend/src/pages/Notes.vue
@@ -45,12 +45,12 @@
                 onClick: () => deleteNote(note.name),
               },
             ]"
-            @click.stop
           >
             <Button
               icon="more-horizontal"
               variant="ghosted"
               class="hover:bg-surface-white"
+              @click.stop
             />
           </Dropdown>
         </div>
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index e00b132c6..4a086699a 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -30,14 +30,14 @@
                     :image="organization.doc.organization_logo"
                   />
                   <component
-                    :is="organization.doc.image ? Dropdown : 'div'"
+                    :is="organization.doc.organization_logo ? Dropdown : 'div'"
                     v-bind="
-                      organization.doc.image
+                      organization.doc.organization_logo
                         ? {
                             options: [
                               {
                                 icon: 'upload',
-                                label: organization.doc.image
+                                label: organization.doc.organization_logo
                                   ? __('Change image')
                                   : __('Upload image'),
                                 onClick: openFileSelector,
@@ -105,6 +105,7 @@
           doctype="CRM Organization"
           :docname="organization.doc.name"
           @reload="sections.reload"
+          @beforeFieldChange="beforeFieldChange"
         />
       </div>
     </Resizer>
@@ -180,6 +181,7 @@ import WebsiteIcon from '@/components/Icons/WebsiteIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
+import DeleteLinkedDocModal from '@/components/DeleteLinkedDocModal.vue'
 import { showAddressModal, addressProps } from '@/composables/modals'
 import { useDocument } from '@/data/document'
 import { getSettings } from '@/stores/settings'
@@ -189,21 +191,19 @@ import { statusesStore } from '@/stores/statuses'
 import { getView } from '@/utils/view'
 import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
 import {
-  Tooltip,
   Breadcrumbs,
   Avatar,
   FileUploader,
   Dropdown,
   Tabs,
-  call,
   createListResource,
   usePageMeta,
   createResource,
   toast,
+  call,
 } from 'frappe-ui'
 import { h, computed, ref } from 'vue'
-import { useRoute } from 'vue-router'
-import DeleteLinkedDocModal from '@/components/DeleteLinkedDocModal.vue'
+import { useRoute, useRouter } from 'vue-router'
 
 const props = defineProps({
   organizationId: {
@@ -218,6 +218,7 @@ const { getDealStatus } = statusesStore()
 const { doctypeMeta } = getMeta('CRM Organization')
 
 const route = useRoute()
+const router = useRouter()
 
 const errorTitle = ref('')
 const errorMessage = ref('')
@@ -277,14 +278,27 @@ async function deleteOrganization() {
   showDeleteLinkedDocModal.value = true
 }
 
-async function changeOrganizationImage(file) {
-  await call('frappe.client.set_value', {
-    doctype: 'CRM Organization',
-    name: props.organizationId,
-    fieldname: 'organization_logo',
-    value: file?.file_url || '',
+function changeOrganizationImage(file) {
+  organization.setValue.submit({
+    organization_logo: file?.file_url || null,
   })
-  organization.reload()
+}
+
+function beforeFieldChange(data) {
+  if (data?.hasOwnProperty('organization_name')) {
+    call('frappe.client.rename_doc', {
+      doctype: 'CRM Organization',
+      old_name: props.organizationId,
+      new_name: data.organization_name,
+    }).then(() => {
+      router.push({
+        name: 'Organization',
+        params: { organizationId: data.organization_name },
+      })
+    })
+  } else {
+    organization.save.submit()
+  }
 }
 
 function website(url) {
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 97d2b193a..d88aaf40e 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -132,6 +132,7 @@ export default defineConfig({
       'prosemirror-state',
       'prosemirror-view',
       'lowlight',
+      'interactjs'
     ],
   },
 })