diff --git a/frontend/src/components/Modals/AddressModal.vue b/frontend/src/components/Modals/AddressModal.vue
index 4067746c..e7263e5b 100644
--- a/frontend/src/components/Modals/AddressModal.vue
+++ b/frontend/src/components/Modals/AddressModal.vue
@@ -41,9 +41,15 @@
       </div>
     </template>
   </Dialog>
+  <QuickEntryModal
+    v-if="showQuickEntryModal"
+    v-model="showQuickEntryModal"
+    doctype="Address"
+  />
 </template>
 
 <script setup>
+import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import Fields from '@/components/Fields.vue'
 import EditIcon from '@/components/Icons/EditIcon.vue'
 import { usersStore } from '@/stores/users'
@@ -189,7 +195,7 @@ watch(
   },
 )
 
-const showQuickEntryModal = defineModel('quickEntry')
+const showQuickEntryModal = ref(false)
 
 function openQuickEntryModal() {
   showQuickEntryModal.value = true
diff --git a/frontend/src/components/Modals/ContactModal.vue b/frontend/src/components/Modals/ContactModal.vue
index 9cec9d4c..3872b1fe 100644
--- a/frontend/src/components/Modals/ContactModal.vue
+++ b/frontend/src/components/Modals/ContactModal.vue
@@ -78,11 +78,7 @@
       </div>
     </template>
   </Dialog>
-  <AddressModal
-    v-model="showAddressModal"
-    v-model:address="_address"
-    v-model:quickEntry="showQuickEntryModal"
-  />
+  <AddressModal v-model="showAddressModal" v-model:address="_address" />
 </template>
 
 <script setup>
diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue
index 081e5cae..fb9e58fe 100644
--- a/frontend/src/components/Modals/OrganizationModal.vue
+++ b/frontend/src/components/Modals/OrganizationModal.vue
@@ -56,11 +56,7 @@
       </div>
     </template>
   </Dialog>
-  <AddressModal
-    v-model="showAddressModal"
-    v-model:address="_address"
-    v-model:quickEntry="showQuickEntryModal"
-  />
+  <AddressModal v-model="showAddressModal" v-model:address="_address" />
 </template>
 
 <script setup>
diff --git a/frontend/src/components/Settings/QuickEntryModal.vue b/frontend/src/components/Modals/QuickEntryModal.vue
similarity index 92%
rename from frontend/src/components/Settings/QuickEntryModal.vue
rename to frontend/src/components/Modals/QuickEntryModal.vue
index b2a4535f..50e6c43c 100644
--- a/frontend/src/components/Settings/QuickEntryModal.vue
+++ b/frontend/src/components/Modals/QuickEntryModal.vue
@@ -20,7 +20,13 @@
             type="select"
             class="w-1/4"
             v-model="_doctype"
-            :options="['CRM Lead', 'CRM Deal', 'Contact', 'CRM Organization', 'Address']"
+            :options="[
+              'CRM Lead',
+              'CRM Deal',
+              'Contact',
+              'CRM Organization',
+              'Address',
+            ]"
             @change="reload"
           />
           <Switch
@@ -54,7 +60,7 @@
 </template>
 <script setup>
 import Fields from '@/components/Fields.vue'
-import QuickEntryLayoutBuilder from '@/components/Settings/QuickEntryLayoutBuilder.vue'
+import QuickEntryLayoutBuilder from '@/components/QuickEntryLayoutBuilder.vue'
 import { useDebounceFn } from '@vueuse/core'
 import { capture } from '@/telemetry'
 import { Dialog, Badge, Switch, call, createResource } from 'frappe-ui'
diff --git a/frontend/src/components/Settings/QuickEntryLayoutBuilder.vue b/frontend/src/components/QuickEntryLayoutBuilder.vue
similarity index 100%
rename from frontend/src/components/Settings/QuickEntryLayoutBuilder.vue
rename to frontend/src/components/QuickEntryLayoutBuilder.vue
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index 6550d48a..a77b2db3 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -230,7 +230,7 @@ import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
 import ContactModal from '@/components/Modals/ContactModal.vue'
-import QuickEntryModal from '@/components/Settings/QuickEntryModal.vue'
+import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import {
   dateFormat,
   dateTooltipFormat,
diff --git a/frontend/src/pages/Contacts.vue b/frontend/src/pages/Contacts.vue
index e9919aa5..e66bdab7 100644
--- a/frontend/src/pages/Contacts.vue
+++ b/frontend/src/pages/Contacts.vue
@@ -77,7 +77,7 @@ import CustomActions from '@/components/CustomActions.vue'
 import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import ContactModal from '@/components/Modals/ContactModal.vue'
-import QuickEntryModal from '@/components/Settings/QuickEntryModal.vue'
+import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import ContactsListView from '@/components/ListViews/ContactsListView.vue'
 import ViewControls from '@/components/ViewControls.vue'
 import { organizationsStore } from '@/stores/organizations.js'
diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index 21112836..1af78c19 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -279,7 +279,7 @@ import KanbanView from '@/components/Kanban/KanbanView.vue'
 import DealModal from '@/components/Modals/DealModal.vue'
 import NoteModal from '@/components/Modals/NoteModal.vue'
 import TaskModal from '@/components/Modals/TaskModal.vue'
-import QuickEntryModal from '@/components/Settings/QuickEntryModal.vue'
+import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import ViewControls from '@/components/ViewControls.vue'
 import { globalStore } from '@/stores/global'
 import { usersStore } from '@/stores/users'
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index 07630275..7f6ada84 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -301,7 +301,7 @@ import KanbanView from '@/components/Kanban/KanbanView.vue'
 import LeadModal from '@/components/Modals/LeadModal.vue'
 import NoteModal from '@/components/Modals/NoteModal.vue'
 import TaskModal from '@/components/Modals/TaskModal.vue'
-import QuickEntryModal from '@/components/Settings/QuickEntryModal.vue'
+import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import ViewControls from '@/components/ViewControls.vue'
 import { globalStore } from '@/stores/global'
 import { usersStore } from '@/stores/users'
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index cfa281d1..c8c943f7 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -233,7 +233,7 @@
 import Icon from '@/components/Icon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
-import QuickEntryModal from '@/components/Settings/QuickEntryModal.vue'
+import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
 import ContactsListView from '@/components/ListViews/ContactsListView.vue'
 import WebsiteIcon from '@/components/Icons/WebsiteIcon.vue'
diff --git a/frontend/src/pages/Organizations.vue b/frontend/src/pages/Organizations.vue
index 519add21..543c0434 100644
--- a/frontend/src/pages/Organizations.vue
+++ b/frontend/src/pages/Organizations.vue
@@ -75,7 +75,7 @@ import CustomActions from '@/components/CustomActions.vue'
 import OrganizationsIcon from '@/components/Icons/OrganizationsIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
-import QuickEntryModal from '@/components/Settings/QuickEntryModal.vue'
+import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import OrganizationsListView from '@/components/ListViews/OrganizationsListView.vue'
 import ViewControls from '@/components/ViewControls.vue'
 import {