diff --git a/components/lib/tree/Tree.js b/components/lib/tree/Tree.js
index 2bc75e0faa..826ca2490c 100644
--- a/components/lib/tree/Tree.js
+++ b/components/lib/tree/Tree.js
@@ -421,6 +421,7 @@ export const Tree = React.memo(
                     dragdropScope={props.dragdropScope}
                     expandIcon={props.expandIcon}
                     expandedKeys={expandedKeys}
+                    isFiltering={isFiltering}
                     isNodeLeaf={isNodeLeaf}
                     metaKeySelection={props.metaKeySelection}
                     nodeTemplate={props.nodeTemplate}
diff --git a/components/lib/tree/UITreeNode.js b/components/lib/tree/UITreeNode.js
index b56741c82e..2c641292e8 100644
--- a/components/lib/tree/UITreeNode.js
+++ b/components/lib/tree/UITreeNode.js
@@ -15,7 +15,8 @@ export const UITreeNode = React.memo((props) => {
     const mergeProps = useMergeProps();
     const isLeaf = props.isNodeLeaf(props.node);
     const label = props.node.label;
-    const expanded = props.expandedKeys ? props.expandedKeys[props.node.key] !== undefined : false;
+    const isFiltering = props.isFiltering;
+    const expanded = (props.expandedKeys ? props.expandedKeys[props.node.key] !== undefined : false) || (!isFiltering && props.node.expanded);
     const { ptm, cx } = props;
 
     const getPTOptions = (key) => {
@@ -908,6 +909,7 @@ export const UITreeNode = React.memo((props) => {
                                 dragdropScope={props.dragdropScope}
                                 expandIcon={props.expandIcon}
                                 expandedKeys={props.expandedKeys}
+                                isFiltering={props.isFiltering}
                                 index={index}
                                 isNodeLeaf={props.isNodeLeaf}
                                 last={index === props.node.children.length - 1}