diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/empty.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/empty.svelte
index 640bb39351..2c223b12ea 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/empty.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/empty.svelte
@@ -265,7 +265,7 @@
                                 icon
                                 variant="extra-compact"
                                 onclick={() => {
-                                    if (mode === 'rows') {
+                                    if (mode !== 'indexes') {
                                         onOpenCreateColumn?.();
                                     }
                                 }}>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
index 1e97d40ea8..f6c0886138 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
@@ -306,6 +306,9 @@
                 <EmptySheet
                     mode="rows-filtered"
                     title="There are no rows that match your filters"
+                    onOpenCreateColumn={() => {
+                        $showCreateColumnSheet.show = true;
+                    }}
                     customColumns={createTableColumns(table.fields, selected)}>
                     {#snippet actions()}
                         <Button
@@ -326,6 +329,9 @@
                 <EmptySheet
                     mode="rows"
                     showActions={$canWriteRows}
+                    onOpenCreateColumn={() => {
+                        $showCreateColumnSheet.show = true;
+                    }}
                     customColumns={createTableColumns(table.fields, selected)}>
                     {#snippet actions()}
                         <EmptySheetCards
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
index 6de8d61ff8..0086f8ab1e 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
@@ -10,12 +10,14 @@
     import type { Column } from '$lib/helpers/types';
     import { preferences } from '$lib/stores/preferences';
     import { onMount } from 'svelte';
+    import { realtime } from '$lib/stores/sdk';
 
     import { showColumnsSuggestionsModal } from '../(suggestions)/store';
     import IconAINotification from '../(suggestions)/icon/aiNotification.svelte';
     import { type Columns, type ColumnDirection, showCreateColumnSheet } from './store';
     import { isCloud } from '$lib/system';
     import { slide } from 'svelte/transition';
+    import { setupColumnObserver } from '../(observer)/columnObserver';
 
     let {
         direction = null,
@@ -144,12 +146,62 @@
     }
 
     export async function submit() {
+        const createdKey = key;
+        let stopObserver: (() => void) | null = null;
+        let waitPromise: Promise<void> | null = null;
+        let startWaiting: ((count: number) => void) | null = null;
+
+        if (createdKey) {
+            const observer = setupColumnObserver();
+            waitPromise = observer.waitPromise;
+            startWaiting = observer.startWaiting;
+
+            const unsubscribe = realtime.forProject(
+                page.params.region,
+                ['project', 'console'],
+                (response) => {
+                    const payload = response.payload as Columns;
+
+                    // We only care about the column we just created
+                    if (payload?.key !== createdKey) return;
+
+                    observer.columnCreationHandler(response);
+                }
+            );
+
+            stopObserver = () => {
+                unsubscribe();
+                observer.cleanup();
+            };
+        }
+
         try {
             await $option.create(databaseId, tableId, key, data);
 
             columnId = key;
             insertColumnInOrder();
 
+            if (createdKey && waitPromise && startWaiting && stopObserver) {
+                startWaiting(1);
+
+                waitPromise
+                    .then(async () => {
+                        await invalidate(Dependencies.TABLE);
+                    })
+                    .catch((error) => {
+                        // avoid unhandled rejections if invalidate(Dependencies.TABLE) fails
+                        console.error(error);
+                        if (error instanceof Error) {
+                            trackError(error, Submit.ColumnCreate);
+                        }
+                    })
+                    .finally(() => {
+                        stopObserver?.();
+                    });
+            } else {
+                stopObserver?.();
+            }
+
             await invalidate(Dependencies.TABLE);
 
             addNotification({
@@ -165,6 +217,7 @@
             }
             return false; // close sheet
         } catch (e) {
+            stopObserver?.();
             addNotification({
                 type: 'error',
                 message: e.message