diff --git a/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue b/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue
index 47748688..fe40284f 100644
--- a/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue
+++ b/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue
@@ -31,8 +31,15 @@ const {
   availableFilterOptions,
   toggleSort,
   customFilter,
+  applySearchFilter,
 } = useTreeFilter(toRef(() => treeviewStore.items));
 
+function onUpdateSelection(val) {
+  treeviewStore.selection = applySearchFilter(val, treeviewStore.selection);
+}
+
+const visibleSelection = computed(() => applySearchFilter(treeviewStore.selection, []));
+
 watch(
   () => treeviewStore.selection,
   async (current, previous) => {
@@ -94,7 +101,7 @@ function handleHoverLeave(item) {
     />
 
     <v-treeview
-      v-model:selected="treeviewStore.selection"
+      :selected="visibleSelection"
       v-model:opened="opened"
       :items="processedItems"
       :search="search"
@@ -104,6 +111,7 @@ function handleHoverLeave(item) {
       select-strategy="classic"
       selectable
       items-registration="props"
+      @update:selected="onUpdateSelection"
     >
       <template #title="{ item }">
         <ObjectTreeItemLabel
diff --git a/app/components/Viewer/ObjectTree/Views/ModelComponents.vue b/app/components/Viewer/ObjectTree/Views/ModelComponents.vue
index 6e80d460..a3946e1e 100644
--- a/app/components/Viewer/ObjectTree/Views/ModelComponents.vue
+++ b/app/components/Viewer/ObjectTree/Views/ModelComponents.vue
@@ -36,9 +36,11 @@ const {
   availableFilterOptions,
   toggleSort,
   customFilter,
+  applySearchFilter,
 } = useTreeFilter(items);
 
-async function onSelectionChange(current) {
+async function onSelectionChange(newSelection) {
+  const current = applySearchFilter(newSelection, mesh_components_selection.value);
   const previous = mesh_components_selection.value;
   const { added, removed } = compareSelections(current, previous);
 
@@ -55,6 +57,8 @@ async function onSelectionChange(current) {
   hybridViewerStore.remoteRender();
 }
 
+const visibleSelection = computed(() => applySearchFilter(mesh_components_selection.value, []));
+
 function showContextMenu(event, item) {
   const actualItem = item.raw || item;
   emit("show-menu", {
@@ -93,14 +97,14 @@ function handleHoverLeave() {
 
     <v-treeview
       v-else
-      :selected="mesh_components_selection"
+      :selected="visibleSelection"
       v-model:opened="opened"
       :items="processedItems"
       :search="search"
       :custom-filter="customFilter"
       class="transparent-treeview"
       item-value="id"
-      select-strategy="independent"
+      select-strategy="classic"
       selectable
       items-registration="props"
       @update:selected="onSelectionChange"
diff --git a/app/composables/use_tree_filter.js b/app/composables/use_tree_filter.js
index 527f386b..e5ecfb00 100644
--- a/app/composables/use_tree_filter.js
+++ b/app/composables/use_tree_filter.js
@@ -3,9 +3,8 @@ function customFilter(value, searchQuery, item) {
     return true;
   }
   const query = searchQuery.toLowerCase();
-  const title = (item.raw.title || "").toLowerCase();
-  const idValue = String(value || "").toLowerCase();
-  return title.includes(query) || idValue.includes(query);
+  const { title = "", id = value } = item.raw || {};
+  return [title, id].some((field) => String(field).toLowerCase().includes(query));
 }
 
 function sortAndFormatItems(items, sortType) {
@@ -21,8 +20,6 @@ function sortAndFormatItems(items, sortType) {
     });
     return {
       ...category,
-      id: category.id,
-      title: category.title || category.id,
       children,
     };
   });
@@ -56,19 +53,58 @@ function useTreeFilter(rawItems, options = {}) {
     if (!rawItems.value) {
       return [];
     }
-    return sortAndFormatItems(
+    const sorted = sortAndFormatItems(
       rawItems.value.filter((category) => {
         const key = category.title || category.id;
         return filterOptions.value[key] !== false;
       }),
       sortType.value,
     );
+    if (!search.value) {
+      return sorted;
+    }
+    return sorted
+      .map((category) => {
+        category.children = (category.children || []).filter((child) =>
+          customFilter(child.id, search.value, { raw: child }),
+        );
+        return category;
+      })
+      .filter((category) => category.children.length > 0);
   });
 
   function toggleSort() {
     sortType.value = sortType.value === "name" ? "id" : "name";
   }
 
+  const allItems = computed(() => {
+    const map = new Map();
+    function traverse(items) {
+      for (const item of items) {
+        map.set(item.id, item);
+        if (item.children) {
+          traverse(item.children);
+        }
+      }
+    }
+    traverse(rawItems.value || []);
+    return map;
+  });
+
+  function applySearchFilter(newSelection, previousSelection = []) {
+    if (!search.value) {
+      return newSelection;
+    }
+    const allItemsMap = allItems.value;
+    function matches(id) {
+      const item = allItemsMap.get(id);
+      return item && customFilter(id, search.value, { raw: item });
+    }
+    const hidden = previousSelection.filter((id) => !matches(id));
+    const visible = newSelection.filter((id) => matches(id));
+    return [...new Set([...hidden, ...visible])];
+  }
+
   return {
     search,
     sortType,
@@ -77,6 +113,7 @@ function useTreeFilter(rawItems, options = {}) {
     availableFilterOptions,
     toggleSort,
     customFilter,
+    applySearchFilter,
   };
 }