diff --git a/frontend/src/lib/components/DBManager.svelte b/frontend/src/lib/components/DBManager.svelte
index cc3c311f21..3b0399b9fb 100644
--- a/frontend/src/lib/components/DBManager.svelte
+++ b/frontend/src/lib/components/DBManager.svelte
@@ -209,6 +209,7 @@
 				dbSupportsSchemas && selected.schemaKey ? `${selected.schemaKey}.${table}` : table
 			return await dbSchemaOps.onFetchTableEditorDefinition({
 				table: table,
+				schema: selected.schemaKey,
 				getColDefs: () => getColDefs(tableKey2)
 			})
 		}
diff --git a/frontend/src/lib/components/apps/components/display/dbtable/queries/relationalKeys.ts b/frontend/src/lib/components/apps/components/display/dbtable/queries/relationalKeys.ts
index f2be7249ca..48d6cbef19 100644
--- a/frontend/src/lib/components/apps/components/display/dbtable/queries/relationalKeys.ts
+++ b/frontend/src/lib/components/apps/components/display/dbtable/queries/relationalKeys.ts
@@ -399,6 +399,7 @@ export async function fetchTableRelationalKeys(
 	input: DbInput,
 	dbType: DbType,
 	table: string,
+	schema: string | undefined,
 	workspace: string,
 	dbArg: Record<string, any>,
 	language: ScriptLang
@@ -407,11 +408,7 @@ export async function fetchTableRelationalKeys(
 	let pk_constraint_name: string | undefined = undefined
 	try {
 		if (dbType !== 'bigquery') {
-			let fkQuery = makeForeignKeysQuery(
-				dbType,
-				table,
-				input.type === 'database' ? input.specificSchema : undefined
-			)
+			let fkQuery = makeForeignKeysQuery(dbType, table, schema)
 			if (input.type === 'ducklake') fkQuery = wrapDucklakeQuery(fkQuery, input.ducklake)
 
 			const fkResult = await runScriptAndPollResult({
@@ -439,11 +436,7 @@ export async function fetchTableRelationalKeys(
 
 	try {
 		if (dbType !== 'bigquery' && dbType !== 'mysql') {
-			let pkQuery = makePrimaryKeyConstraintQuery(
-				dbType,
-				table,
-				input.type === 'database' ? input.specificSchema : undefined
-			)
+			let pkQuery = makePrimaryKeyConstraintQuery(dbType, table, schema)
 			if (input.type === 'ducklake') pkQuery = wrapDucklakeQuery(pkQuery, input.ducklake)
 
 			const pkResult = await runScriptAndPollResult({
diff --git a/frontend/src/lib/components/dbOps.ts b/frontend/src/lib/components/dbOps.ts
index c3a4801f63..afc9a1686b 100644
--- a/frontend/src/lib/components/dbOps.ts
+++ b/frontend/src/lib/components/dbOps.ts
@@ -130,6 +130,7 @@ export type IDbSchemaOps = {
 	onDeleteSchema: (params: { schema: string }) => Promise<void>
 	onFetchTableEditorDefinition: (params: {
 		table: string
+		schema?: string
 		getColDefs: () => Promise<TableMetadata>
 	}) => Promise<TableEditorValues>
 }
@@ -189,12 +190,13 @@ export function dbSchemaOpsWithPreviewScripts({
 				requestBody: { args: { ...dbArg }, language, content: dropSchemaQuery }
 			})
 		},
-		onFetchTableEditorDefinition: async ({ table, getColDefs }) => {
+		onFetchTableEditorDefinition: async ({ table, schema, getColDefs }) => {
 			let colDefs = await getColDefs()
 			let { foreignKeys, pk_constraint_name } = await fetchTableRelationalKeys(
 				input,
 				dbType,
 				table,
+				schema,
 				workspace,
 				dbArg,
 				language