diff --git a/webapp/packages/plugin-navigation-tree/src/TreeNew/useTreeFilter.ts b/webapp/packages/plugin-navigation-tree/src/TreeNew/useTreeFilter.ts
index 1f83e46b20..88e238fb12 100644
--- a/webapp/packages/plugin-navigation-tree/src/TreeNew/useTreeFilter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/TreeNew/useTreeFilter.ts
@@ -29,8 +29,12 @@ export function useTreeFilter(options: ITreeFilterOptions = {}): Readonly<ITreeF
   options = useObjectRef(options);
   const matchCache = new Map<string, boolean>();
 
-  function hasMatchingDescendant(
-    treeData: ITreeData, nodeId: string, filter: string, matchFn: (treeData: ITreeData, nodeId: string) => boolean): boolean {
+  function matchesOrHasMatchingDescendant(
+    treeData: ITreeData,
+    nodeId: string,
+    filter: string,
+    matchFn: (treeData: ITreeData, nodeId: string) => boolean,
+  ): boolean {
     const cacheKey = `${nodeId}:${filter}`;
     if (matchCache.has(cacheKey)) {
       return matchCache.get(cacheKey)!;
@@ -43,7 +47,7 @@ export function useTreeFilter(options: ITreeFilterOptions = {}): Readonly<ITreeF
 
     const children = treeData.getUnfilteredChildren(nodeId);
     for (const childId of children) {
-      if (hasMatchingDescendant(treeData, childId, filter, matchFn)) {
+      if (matchesOrHasMatchingDescendant(treeData, childId, filter, matchFn)) {
         matchCache.set(cacheKey, true);
         return true;
       }
@@ -94,8 +98,8 @@ export function useTreeFilter(options: ITreeFilterOptions = {}): Readonly<ITreeF
           return state;
         }
 
-        if (hasMatchingDescendant(treeData, nodeId, filter, this.isNodeMatched.bind(this))) {
-          return { ...state, expanded: true };
+        if (matchesOrHasMatchingDescendant(treeData, nodeId, filter, this.isNodeMatched.bind(this))) {
+          return { ...state };
         }
 
         return state;
diff --git a/webapp/packages/plugin-navigation-tree/src/TreeNew/useTreeMenu.ts b/webapp/packages/plugin-navigation-tree/src/TreeNew/useTreeMenu.ts
index e93296378f..7578e6c358 100644
--- a/webapp/packages/plugin-navigation-tree/src/TreeNew/useTreeMenu.ts
+++ b/webapp/packages/plugin-navigation-tree/src/TreeNew/useTreeMenu.ts
@@ -33,7 +33,7 @@ export function useTreeMenu(options: ITreeMenuOptions): Readonly<ITreeMenu> {
 
   const state = useObservableRef(
     () => ({
-      openMenu(event: React.MouseEvent, nodeId: string) {
+      openMenu(event: React.MouseEvent<HTMLDivElement, MouseEvent>, nodeId: string) {
         this.menu.context.deleteForId(this.id);
         this.menu.context.set(DATA_CONTEXT_NAV_NODE_ID, nodeId, this.id);