diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vue
index 2ec47ad127..45fec3efb6 100644
--- a/apps/desktop/src/components/sidebar/TreeItem.vue
+++ b/apps/desktop/src/components/sidebar/TreeItem.vue
@@ -561,7 +561,7 @@ async function newQuery() {
     await connectionStore.ensureConnected(node.connectionId);
     connectionStore.activeConnectionId = node.connectionId;
     if (node.database) {
-      queryStore.createTab(node.connectionId, node.database, undefined, "query");
+      queryStore.createTab(node.connectionId, node.database, undefined, "query", node.schema);
       return;
     }
     const connection = connectionStore.getConfig(node.connectionId);
diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts
index f0e5c6d04c..8505e2d076 100644
--- a/apps/desktop/src/stores/queryStore.ts
+++ b/apps/desktop/src/stores/queryStore.ts
@@ -111,7 +111,13 @@ export const useQueryStore = defineStore("query", () => {
     return tabs.value.find((t) => t.connectionId === connectionId && t.database === database && t.title === title);
   }
 
-  function createTab(connectionId: string, database: string, title?: string, mode: QueryTab["mode"] = "query") {
+  function createTab(
+    connectionId: string,
+    database: string,
+    title?: string,
+    mode: QueryTab["mode"] = "query",
+    schema?: string,
+  ) {
     if (title) {
       const existing = findTabByTitle(connectionId, database, title);
       if (existing) {
@@ -126,6 +132,7 @@ export const useQueryStore = defineStore("query", () => {
       title: title || `Query ${tabs.value.length + 1}`,
       connectionId,
       database,
+      schema,
       sql: "",
       isExecuting: false,
       isCancelling: false,