diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
index 419840f2e..cfefc3a7f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -475,8 +475,7 @@
         <EditRow
             bind:this={editRow}
             bind:row={$databaseRowSheetOptions.row}
-            bind:rowId={$databaseRowSheetOptions.rowId}
-            autoFocus={$databaseRowSheetOptions.autoFocus} />
+            bind:rowId={$databaseRowSheetOptions.rowId} />
     {/key}
 </SideSheet>
 
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 738b4fab9..03b95bea6 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
@@ -19,12 +19,10 @@
 
     let {
         row = $bindable(),
-        rowId = $bindable(null),
-        autoFocus = true
+        rowId = $bindable(null)
     }: {
         row?: Models.Row | null;
         rowId?: string | null;
-        autoFocus?: boolean;
     } = $props();
 
     let loading = $state(false);
@@ -78,9 +76,7 @@
     $effect(() => {
         if (row) {
             work = initWork();
-            if (autoFocus) {
-                focusFirstInput();
-            }
+            requestAnimationFrame(() => focusFirstInput());
         } else {
             work = null;
         }
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
index 71f9bda02..ecf308d49 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
@@ -543,13 +543,11 @@
         } else if (type === 'row') {
             if (action === 'update') {
                 databaseRowSheetOptions.update((opts) => {
-                    const wasOpen = opts.show;
                     return {
                         ...opts,
                         row,
                         show: true,
-                        title: 'Update row',
-                        autoFocus: !wasOpen,
+                        title: 'Update row'
                     };
                 });
             }
@@ -760,15 +758,11 @@
 
     $: rowSelection = !$spreadsheetLoading && !$paginatedRowsLoading ? true : ('disabled' as const);
 
-    $: if (!$databaseRowSheetOptions.show) {
-        $databaseRowSheetOptions.autoFocus = true;
-
-        if (previouslyFocusedElement) {
-            requestAnimationFrame(() => {
-                (previouslyFocusedElement as HTMLElement)?.focus();
-                previouslyFocusedElement = null;
-            });
-        }
+    $: if (!$databaseRowSheetOptions.show && previouslyFocusedElement) {
+        requestAnimationFrame(() => {
+            (previouslyFocusedElement as HTMLElement)?.focus();
+            previouslyFocusedElement = null;
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
index 245080513..f5679dfb6 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
@@ -64,14 +64,12 @@ export const databaseRowSheetOptions = writable<
     DatabaseSheetOptions & {
         row: Models.Row;
         rowId?: string;
-        autoFocus?: boolean;
     }
 >({
     title: null,
     show: false,
     row: null,
-    rowId: null, // for loading from a given id
-    autoFocus: true
+    rowId: null // for loading from a given id
 });
 
 export const databaseRelatedRowSheetOptions = writable<