Search tree in multiroot doesn't collapse to one below rootandreamah/issue161858

Fixes #161858

1 files changed, 3 insertions, 3 deletions

diff --git a/src/vs/workbench/contrib/search/browser/searchActions.ts b/src/vs/workbench/contrib/search/browser/searchActions.ts
index cd458000ec8..b06ac120519 100644
--- a/src/vs/workbench/contrib/search/browser/searchActions.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActions.ts
@@ -300,7 +300,7 @@ export function collapseDeepestExpandedLevel(accessor: ServicesAccessor) {
 				}
 				if (searchView.isTreeLayoutViewVisible && !canCollapseFirstLevel) {
 					const immediateParent = node.parent();
-					if (immediateParent instanceof FolderMatchWorkspaceRoot || immediateParent instanceof FolderMatchNoRoot) {
+					if (!(immediateParent instanceof FolderMatchWorkspaceRoot || immediateParent instanceof FolderMatchNoRoot || immediateParent instanceof SearchResult)) {
 						canCollapseFirstLevel = true;
 					}
 				}
@@ -320,8 +320,8 @@ export function collapseDeepestExpandedLevel(accessor: ServicesAccessor) {
 				do {
 					const immediateParent = node.parent();
 					if (immediateParent instanceof FolderMatchWorkspaceRoot || immediateParent instanceof FolderMatchNoRoot) {
-						if (viewer.hasElement(immediateParent) && viewer.isCollapsed(immediateParent)) {
-							viewer.collapse(immediateParent, true);
+						if (viewer.hasElement(node)) {
+							viewer.collapse(node, true);
 						} else {
 							viewer.collapseAll();
 						}