diff --git a/studio/pages/project/[ref]/database/tables.tsx b/studio/pages/project/[ref]/database/tables.tsx
index 9509c305485..e7750e36de0 100644
--- a/studio/pages/project/[ref]/database/tables.tsx
+++ b/studio/pages/project/[ref]/database/tables.tsx
@@ -176,7 +176,7 @@ const DatabaseTables: NextPageWithLayout = () => {
       />
       <SidePanelEditor
         sidePanelKey={sidePanelKey}
-        selectedSchema="public"
+        selectedSchema={selectedSchema}
         selectedTable={selectedTable}
         onColumnSaved={onColumnUpdated}
         closePanel={onClosePanel}