diff --git a/TablePro/Views/Main/Extensions/MainContentView+Setup.swift b/TablePro/Views/Main/Extensions/MainContentView+Setup.swift
index dfcc679e..7149a6ba 100644
--- a/TablePro/Views/Main/Extensions/MainContentView+Setup.swift
+++ b/TablePro/Views/Main/Extensions/MainContentView+Setup.swift
@@ -161,7 +161,8 @@ extension MainContentView {
         } else {
             let langName = PluginManager.shared.queryLanguageName(for: connection.type)
             let queryLabel = "\(langName) Query"
-            windowTitle = selectedTab?.tableName
+            windowTitle = (selectedTab?.tabType == .table ? selectedTab?.tableName : nil)
+                ?? selectedTab?.title
                 ?? (tabManager.tabs.isEmpty ? connection.name : queryLabel)
         }
         viewWindow?.representedURL = selectedTab?.sourceFileURL