diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
index 3e31c2ec8..536212989 100644
--- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
@@ -664,9 +664,11 @@
         tabComponent: 'SqlObjectTab',
         tabPreviewMode: true,
         props: {
-          appObjectData: data,
           conid: data.conid,
           database: data.database,
+          schemaName: data.schemaName,
+          pureName: data.pureName,
+          objectTypeField: data.objectTypeField,
         },
       });
     } else {
@@ -722,10 +724,10 @@
 
     openNewTab(
       {
-        title: scriptTemplate ? 'Query #' : getObjectTitle(connection, schemaName, pureName),
+        title: getObjectTitle(connection, schemaName, pureName),
         tooltip,
         icon: icon || (scriptTemplate ? 'img sql-file' : databaseObjectIcons[objectTypeField]),
-        tabComponent: scriptTemplate ? 'QueryTab' : tabComponent,
+        tabComponent: scriptTemplate ? 'SqlObjectTab' : tabComponent,
         appObject: 'DatabaseObjectAppObject',
         appObjectData,
         tabPreviewMode,
diff --git a/packages/web/src/tabs/SqlObjectTab.svelte b/packages/web/src/tabs/SqlObjectTab.svelte
index 57cffea99..1c96bdf9d 100644
--- a/packages/web/src/tabs/SqlObjectTab.svelte
+++ b/packages/web/src/tabs/SqlObjectTab.svelte
@@ -32,9 +32,23 @@
   export let appObjectData;
   export let scriptTemplate;
 
+  export let schemaName;
+  export let pureName;
+  export let conid;
+  export let database;
+  export let objectTypeField;
+
+  $: appObjectData = {
+    schemaName,
+    pureName,
+    conid,
+    database,
+    objectTypeField,
+  };
+
   $: defaultScriptTemplate = getSupportedScriptTemplates(appObjectData.objectTypeField)?.[0]?.scriptTemplate;
 
-  $: connection = useConnectionInfo({ conid: appObjectData.conid });
+  $: connection = useConnectionInfo({ conid });
   $: driver = findEngineDriver($connection, $extensions);
 
   const tabVisible: any = getContext('tabVisible');