diff --git a/frontend/src/components/Settings/SidebarLayoutBuilder.vue b/frontend/src/components/Settings/SidebarLayoutBuilder.vue
index 643bea61..a95ab9f2 100644
--- a/frontend/src/components/Settings/SidebarLayoutBuilder.vue
+++ b/frontend/src/components/Settings/SidebarLayoutBuilder.vue
@@ -42,6 +42,7 @@
           <div v-show="section.opened" class="p-4 pt-0 pb-2">
             <Draggable
               :list="section.fields"
+              group="fields"
               item-key="label"
               class="flex flex-col gap-1"
               handle=".cursor-grab"
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index fd8fbb85..4b7fc150 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -583,7 +583,7 @@ const deal_contacts = createResource({
   cache: ['deal_contacts', props.dealId],
   auto: true,
   onSuccess: (data) => {
-    let contactSection = fieldsLayout.data.find(
+    let contactSection = fieldsLayout.data?.find(
       (section) => section.name == 'contacts_section',
     )
     if (!contactSection) return