diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 73546a870d..531529572f 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -139,8 +139,8 @@ const expandForm = (row: Row, state?: Record<string, any>, fromToolbar = false)
 
   if (rowId) {
     router.push({
-      params: {
-        ...route.params,
+      query: {
+        ...route.query,
         rowId,
       },
     })
@@ -398,18 +398,21 @@ onBeforeUnmount(async () => {
 
 const expandedFormOnRowIdDlg = computed({
   get() {
-    return !!route.params.rowId
+    return !!route.query.rowId
   },
   set(val) {
     if (!val)
       router.push({
-        params: {
-          ...route.params,
+        query: {
+          ...route.query,
           rowId: undefined,
         },
       })
   },
 })
+
+// reload table data reload hook as fallback to rowdatareload
+provide(ReloadRowDataHookInj, reloadViewDataHook)
 </script>
 
 <template>
@@ -653,11 +656,11 @@ const expandedFormOnRowIdDlg = computed({
 
     <SmartsheetExpandedForm
       v-if="expandedFormOnRowIdDlg"
-      :key="route.params.rowId"
+      :key="route.query.rowId"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
-      :row-id="route.params.rowId"
+      :row-id="route.query.rowId"
     />
   </div>
 </template>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index a0d7621f39..7a56339e1d 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -26,6 +26,7 @@ const save = async () => {
     reloadTrigger?.trigger()
   } else {
     await _save()
+    reloadTrigger?.trigger()
   }
 }
 
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 3e1ccaf8f2..45c450a275 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -53,16 +53,14 @@ provide(MetaInj, meta)
 
 const { commentsDrawer, changedColumns, state: rowState, isNew, loadRow } = useProvideExpandedFormStore(meta, row)
 
-
 if (props.loadRow) {
   await loadRow()
 }
 
 if (props.rowId) {
-  loadRow(props.rowId)
+  await loadRow(props.rowId)
 }
 
-
 useProvideSmartsheetStore(ref({}) as Ref<ViewType>, meta)
 
 provide(IsFormInj, ref(true))
diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index/index/[type]/[title]/[[viewTitle]]/[[rowId]].vue b/packages/nc-gui/pages/[projectType]/[projectId]/index/index/[type]/[title]/[[viewTitle]].vue
similarity index 100%
rename from packages/nc-gui/pages/[projectType]/[projectId]/index/index/[type]/[title]/[[viewTitle]]/[[rowId]].vue
rename to packages/nc-gui/pages/[projectType]/[projectId]/index/index/[type]/[title]/[[viewTitle]].vue