diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/columnForm.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/columnForm.svelte
index e8a9ebd61..0bb7fcf44 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/columnForm.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/columnForm.svelte
@@ -16,7 +16,11 @@
     <Layout.Stack>
         {#each columns as column}
             {@const label = column.key}
-            <ColumnItem {column} bind:formValues {label} />
+            <ColumnItem
+                {label}
+                {column}
+                {formValues}
+                onUpdateFormValues={(values) => (formValues = values)} />
         {/each}
 
         {#if customId !== undefined}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
index aec5e8ad4..8a28b2744 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
@@ -119,6 +119,12 @@
             createMore = false;
         }
     });
+
+    $effect(() => {
+        if ($createRow) {
+            console.log($createRow.row);
+        }
+    });
 </script>
 
 {#if $createRow}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/edit.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/edit.svelte
index c82c61672..b5e154ebf 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/edit.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/edit.svelte
@@ -118,6 +118,10 @@
 
         firstInput?.focus({ preventScroll: true });
     }
+
+    function updateRowData(values: object) {
+        work.set(values as Models.Row);
+    }
 </script>
 
 {#if $table.columns?.length && work}
@@ -125,7 +129,12 @@
         <Layout.Stack direction="column" gap="l">
             {#each $table.columns as column}
                 {@const label = column.key}
-                <ColumnItem {column} bind:formValues={$work} {label} editing />
+                <ColumnItem
+                    {column}
+                    {label}
+                    editing
+                    formValues={$work}
+                    onUpdateFormValues={updateRowData} />
             {/each}
         </Layout.Stack>
     </div>