diff --git a/frontend/composables/useFieldViews.ts b/frontend/composables/useFieldViews.ts
index a31039c..de87d98 100644
--- a/frontend/composables/useFieldViews.ts
+++ b/frontend/composables/useFieldViews.ts
@@ -308,12 +308,13 @@ export const useViewState = <T extends { id?: string }>(
   }
 
   const handleSave = async (data: T) => {
+    let savedRecord
     if (data.id) {
-      await updateRecord(data.id, data)
+      savedRecord = await updateRecord(data.id, data)
     } else {
-      await createRecord(data)
+      savedRecord = await createRecord(data)
     }
-    showDetail(currentRecord.value!)
+    return savedRecord
   }
 
   return {
diff --git a/frontend/pages/app/objects/[objectName]/[[recordId]]/[[view]].vue b/frontend/pages/app/objects/[objectName]/[[recordId]]/[[view]].vue
index f75e65f..1e4f304 100644
--- a/frontend/pages/app/objects/[objectName]/[[recordId]]/[[view]].vue
+++ b/frontend/pages/app/objects/[objectName]/[[recordId]]/[[view]].vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, computed, onMounted, watch } from 'vue'
+import { ref, computed, onMounted, watch, nextTick } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useApi } from '@/composables/useApi'
 import { useFields, useViewState } from '@/composables/useFieldViews'
@@ -111,8 +111,13 @@ const handleDelete = async (rows: any[]) => {
 
 const handleSaveRecord = async (data: any) => {
   try {
-    await handleSave(data)
-    router.push(`/app/objects/${objectApiName.value}/${currentRecord.value?.id || data.id}/detail`)
+    const savedRecord = await handleSave(data)
+    if (savedRecord?.id) {
+      router.push(`/app/objects/${objectApiName.value}/${savedRecord.id}/detail`)
+    } else {
+      // Fallback to list if no ID available
+      router.push(`/app/objects/${objectApiName.value}/`)
+    }
   } catch (e: any) {
     error.value = e.message || 'Failed to save record'
   }