diff --git a/src/lib/components/Datasets/Datasets.svelte b/src/lib/components/Datasets/Datasets.svelte
index 850ce04..6c70ae1 100644
--- a/src/lib/components/Datasets/Datasets.svelte
+++ b/src/lib/components/Datasets/Datasets.svelte
@@ -2,8 +2,8 @@
 	import type { Table } from '$lib/olap-engine';
 
 	import SearchBar from '$lib/components/SearchBar.svelte';
-	import { buildTree, filter } from './utils';
 	import Tree from './Tree.svelte';
+	import { buildTree, filter } from './utils';
 
 	type Props = {
 		tables?: Table[];
@@ -20,7 +20,7 @@
 
 <div>
 	{#each tree as node}
-		<Tree {node} />
+		<Tree {node} expanded={!!search} />
 	{/each}
 </div>
 
diff --git a/src/lib/components/Datasets/Tree.svelte b/src/lib/components/Datasets/Tree.svelte
index 48d86ca..6ee1094 100644
--- a/src/lib/components/Datasets/Tree.svelte
+++ b/src/lib/components/Datasets/Tree.svelte
@@ -1,13 +1,17 @@
 <script lang="ts">
-	import FolderOpen from '$lib/icons/FolderOpen.svelte';
 	import Folder from '$lib/icons/Folder.svelte';
+	import FolderOpen from '$lib/icons/FolderOpen.svelte';
 	import Table from '$lib/icons/Table.svelte';
 	import Columns from './Columns.svelte';
 	import Tree from './Tree.svelte';
 
-	let { node = {}, level = 0 } = $props();
+	let { node = {}, level = 0, expanded: forceExpanded = false } = $props();
 	let expanded = $state(false);
 
+	$effect(() => {
+		expanded = forceExpanded;
+	});
+
 	function toggleExpanded() {
 		expanded = !expanded;
 	}
@@ -41,7 +45,7 @@
 	</button>
 	{#if node.type === 'group' && node.children && expanded}
 		{#each node.children as child}
-			<Tree node={child} level={level + 1} />
+			<Tree node={child} level={level + 1} expanded={forceExpanded} />
 		{/each}
 	{/if}
 	{#if node.type === 'dataset' && expanded}