From 463c3cd7f068b326a60aa00eba6b07a654b19db3 Mon Sep 17 00:00:00 2001
From: Melody Ruch <396921921@qq.com>
Date: Wed, 12 Aug 2026 19:26:09 +0800
Subject: [PATCH] fix(sidebar): avoid expanding unloaded located tables

---
 apps/desktop/src/components/sidebar/ConnectionTree.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src/components/sidebar/ConnectionTree.vue b/apps/desktop/src/components/sidebar/ConnectionTree.vue
index 74cc00c110..a0523bef26 100644
--- a/apps/desktop/src/components/sidebar/ConnectionTree.vue
+++ b/apps/desktop/src/components/sidebar/ConnectionTree.vue
@@ -1065,7 +1065,11 @@ async function locateActiveTabInSidebar() {
   if (!nodePath) return;
 
   for (const ancestor of nodePath) {
-    if (!ancestor.isExpanded) {
+    // Only flip the arrow when this node's own children are already loaded
+    // (e.g. by ensureTreeLoadedForTarget above). Forcing isExpanded on a
+    // table/collection whose column/index groups were never fetched shows an
+    // "expanded" arrow with no content underneath (issue #5850).
+    if (!ancestor.isExpanded && store.canUseLoadedTreeNodeToggle(ancestor)) {
       ancestor.isExpanded = true;
     }
   }