diff --git a/src/pages/vimp/components/alarm-tree.vue b/src/pages/vimp/components/alarm-tree.vue
index 46de4b0..4e7c916 100644
--- a/src/pages/vimp/components/alarm-tree.vue
+++ b/src/pages/vimp/components/alarm-tree.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { NIcon, NTabPane, NTabs, NTree, type TreeOverrideNodeClickBehavior, type TreeProps } from 'naive-ui';
-import { h, type CSSProperties } from 'vue';
+import { computed, h, type CSSProperties } from 'vue';
 import { useAlarmStore, useResourcePanelStore } from '../stores';
 import { storeToRefs } from 'pinia';
 import { useChannelsQuery } from '../composables';
@@ -99,6 +99,8 @@ const renderNodeSuffix: TreeProps['renderSuffix'] = ({ option }) => {
 const resourcePanelStore = useResourcePanelStore();
 const { searchPattern } = storeToRefs(resourcePanelStore);
 
+const defaultExpandAll = computed(() => searchPattern.value.trim().length > 0);
+
 const searchFilter: TreeProps['filter'] = (pattern, node) => {
   if (!isAlarmNode(node)) return false;
   return node.alarm.name.includes(pattern);
@@ -119,7 +121,7 @@ const searchFilter: TreeProps['filter'] = (pattern, node) => {
       :render-label="renderNodeLabel"
       :render-suffix="renderNodeSuffix"
       :override-default-node-click-behavior="overrideNodeClickBehavior"
-      :default-expand-all="searchPattern.trim().length > 0"
+      :default-expand-all="defaultExpandAll"
       :show-irrelevant-nodes="false"
       :data="lineTabPanes.at(0)?.alarmTree"
       :pattern="searchPattern"
@@ -156,7 +158,7 @@ const searchFilter: TreeProps['filter'] = (pattern, node) => {
             :render-label="renderNodeLabel"
             :render-suffix="renderNodeSuffix"
             :override-default-node-click-behavior="overrideNodeClickBehavior"
-            :default-expand-all="false"
+            :default-expand-all="defaultExpandAll"
             :show-irrelevant-nodes="false"
             :data="alarmTree"
             :pattern="searchPattern"
diff --git a/src/pages/vimp/components/camera-tree.vue b/src/pages/vimp/components/camera-tree.vue
index 061af59..7ecb1c9 100644
--- a/src/pages/vimp/components/camera-tree.vue
+++ b/src/pages/vimp/components/camera-tree.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { NIcon, NTabPane, NTabs, NTree, type TreeOverrideNodeClickBehavior, type TreeProps } from 'naive-ui';
-import { h, type CSSProperties } from 'vue';
+import { computed, h, type CSSProperties } from 'vue';
 import { useCameraStore, useResourcePanelStore } from '../stores';
 import { storeToRefs } from 'pinia';
 import { useChannelsQuery } from '../composables';
@@ -102,6 +102,8 @@ const renderNodeSuffix: TreeProps['renderSuffix'] = ({ option }) => {
 const resourcePanelStore = useResourcePanelStore();
 const { searchPattern } = storeToRefs(resourcePanelStore);
 
+const defaultExpandAll = computed(() => searchPattern.value.trim().length > 0);
+
 const searchFilter: TreeProps['filter'] = (pattern, node) => {
   if (!isCameraNode(node)) return false;
   return node.camera.name.includes(pattern);
@@ -122,7 +124,7 @@ const searchFilter: TreeProps['filter'] = (pattern, node) => {
       :render-label="renderNodeLabel"
       :render-suffix="renderNodeSuffix"
       :override-default-node-click-behavior="overrideNodeClickBehavior"
-      :default-expand-all="searchPattern.trim().length > 0"
+      :default-expand-all="defaultExpandAll"
       :show-irrelevant-nodes="false"
       :data="lineTabPanes.at(0)?.cameraTree"
       :pattern="searchPattern"
@@ -159,7 +161,7 @@ const searchFilter: TreeProps['filter'] = (pattern, node) => {
             :render-label="renderNodeLabel"
             :render-suffix="renderNodeSuffix"
             :override-default-node-click-behavior="overrideNodeClickBehavior"
-            :default-expand-all="false"
+            :default-expand-all="defaultExpandAll"
             :show-irrelevant-nodes="false"
             :data="cameraTree"
             :pattern="searchPattern"