diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index 764609f94b..08fde6efc8 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -4,6 +4,10 @@ import { useVModel } from '#imports'
 
 interface Props {
   modelValue?: string | null
+  defaultGeoPosition?: {
+    lat: number
+    long: number
+  }
 }
 
 interface Emits {
@@ -16,6 +20,8 @@ const emits = defineEmits<Emits>()
 
 const vModel = useVModel(props, 'modelValue', emits)
 
+const defaultGeoPosition = useVModel(props, 'defaultGeoPosition')
+
 let error = $ref<string | undefined>()
 
 let isExpanded = $ref(false)
@@ -93,6 +99,7 @@ const onGetCurrentLocation = () => {
             @mousedown.stop
           />
         </a-form-item>
+        defaultGeoPosition: {{ JSON.stringify(defaultGeoPosition) }}
         <a-form-item class="inputLng" label="Lng">
           <a-input
             v-model:value="formState.longitude"
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index 53901969c0..23fac1bc0c 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -19,9 +19,9 @@ import {
   isDateTime,
   isDecimal,
   isDuration,
-  isGeoData,
   isEmail,
   isFloat,
+  isGeoData,
   isInt,
   isJSON,
   isManualSaved,
@@ -46,6 +46,7 @@ import {
   useVModel,
 } from '#imports'
 import { NavigateDir } from '~/lib'
+import { InitialGeoPositionData } from './expanded-form/index.vue';
 
 interface Props {
   column: ColumnType
@@ -55,6 +56,10 @@ interface Props {
   rowIndex?: number
   active?: boolean
   virtual?: boolean
+  // TODO: check whether
+  // a) this is in general the right approach to pass in default values
+  // b) if yes: probably we want to make it generic (column type independent)
+  defaultGeoPosition?: InitialGeoPositionData
 }
 
 const props = defineProps<Props>()
@@ -139,7 +144,7 @@ const syncAndNavigate = (dir: NavigateDir, e: KeyboardEvent) => {
   >
     <template v-if="column">
       <LazyCellTextArea v-if="isTextArea(column)" v-model="vModel" />
-      <LazyCellGeoData v-else-if="isGeoData(column)" v-model="vModel" />
+      <LazyCellGeoData v-else-if="isGeoData(column)" v-model="vModel" :default-geo-position="props.defaultGeoPosition" />
       <LazyCellCheckbox v-else-if="isBoolean(column, abstractType)" v-model="vModel" />
       <LazyCellAttachment v-else-if="isAttachment(column)" v-model="vModel" :row-index="props.rowIndex" />
       <LazyCellSingleSelect v-else-if="isSingleSelect(column)" v-model="vModel" :row-index="props.rowIndex" />
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 0f2917ba3f..1a72578d66 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -6,6 +6,7 @@ import {
   FieldsInj,
   IsFormInj,
   IsKanbanInj,
+  IsMapInj,
   MetaInj,
   ReloadRowDataHookInj,
   computedInject,
@@ -23,7 +24,7 @@ import {
 } from '#imports'
 import type { Row } from '~/lib'
 
-interface InitialGeoPositionData {
+export interface InitialGeoPositionData {
   lat?: number
   long?: number
   geoColId?: string
@@ -51,6 +52,8 @@ const state = toRef(props, 'state')
 
 const meta = toRef(props, 'meta')
 
+const newRow = row.value.row.geoColId
+
 // const initialGeoPositionData = toRef(props, 'initialGeoPositionData')
 const initialGeoPositionData = ref(props.initialGeoPositionData)
 
@@ -65,6 +68,8 @@ const fields = computedInject(FieldsInj, (_fields) => {
 
 const isKanban = inject(IsKanbanInj, ref(false))
 
+const isMap = inject(IsMapInj, ref(false))
+
 provide(MetaInj, meta)
 
 const { commentsDrawer, changedColumns, state: rowState, isNew, loadRow } = useProvideExpandedFormStore(meta, row)
@@ -120,7 +125,6 @@ reloadHook.on(() => {
   if (isNew.value) return
   loadRow()
 })
-
 provide(ReloadRowDataHookInj, reloadHook)
 
 if (isKanban.value) {
@@ -132,10 +136,37 @@ if (isKanban.value) {
   }
 }
 
+// if (isMap.value) {
+//   console.log('fields', fields.value)
+//   for (const [k, v] of Object.entries(row.value.row)) {
+//     if (v) {
+//       console.log('value', v, 'key', k)
+//     }
+//   }
+//   if (initialGeoPositionData?.value?.lat) {
+//     // Filter the columns by their id
+//     const filteredColumns = meta?.value?.columns.filter((col) => col.id === initialGeoPositionData?.value?.geoColId)
+//     // If there are any columns that match the geoColId
+//     if (filteredColumns.length > 0) {
+//       // Get the first (and possibly only) column that matches the geoColId
+//       const geoColumn = filteredColumns[0]
+//       console.log('geoColumn', geoColumn.id )
+//       // Load the lat and long values for the geoColumn
+//       if (geoColumn.title) {
+
+//         const lat = initialGeoPositionData.value.lat
+//         const long = initialGeoPositionData.value.long
+//         row.value.row[geoColumn.title] = lat
+
+//         console.log('lat', lat)
+//         console.log('long', long)
+//       }
+//     }
+//   }
+// }
 const cellWrapperEl = ref<HTMLElement>()
 
 onMounted(() => {
-
   setTimeout(() => {
     ;(cellWrapperEl.value?.querySelector('input,select,textarea') as HTMLInputElement)?.focus()
   })
@@ -161,7 +192,7 @@ export default {
     <SmartsheetExpandedFormHeader :view="props.view" @cancel="onClose" />
 
     <div class="!bg-gray-100 rounded flex-1">
-      FOO geodata: {{ JSON.stringify(initialGeoPositionData) }} BAR
+      FOO geodata: {{ JSON.stringify(initialGeoPositionData?.geoColId) }} BAR
 
       <div class="flex h-full nc-form-wrapper items-stretch min-h-[max(70vh,100%)]">
         <div class="flex-1 overflow-auto scrollbar-thin-dull nc-form-fields-container">
@@ -190,6 +221,7 @@ export default {
                   :column="col"
                   :edit-enabled="true"
                   :active="true"
+                  :default-geo-position="initialGeoPositionData"
                   @update:model-value="changedColumns.add(col.title)"
                 />
               </div>