diff --git a/TablePro/Views/Main/MainContentCoordinator.swift b/TablePro/Views/Main/MainContentCoordinator.swift
index b1cfd396..93644099 100644
--- a/TablePro/Views/Main/MainContentCoordinator.swift
+++ b/TablePro/Views/Main/MainContentCoordinator.swift
@@ -701,6 +701,8 @@ final class MainContentCoordinator {
                 tabManager.tabs[tabIndex].query = existingQuery + "\n\n" + query
             }
             tabManager.tabs[tabIndex].hasUserInteraction = true
+        } else if tabManager.tabs.isEmpty {
+            tabManager.addTab(initialQuery: query, databaseName: connection.database)
         } else {
             let payload = EditorTabPayload(
                 connectionId: connection.id,