diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 0f68221ba1..7e98861b8a 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -84,7 +84,7 @@
         ...datasource,
         selected,
         containsSelected,
-        open: open || onlySource || !!searchTerm,
+        open: containsSelected || open || onlySource || !!searchTerm,
         queries: dsQueries,
         tables: dsTables,
       }