Brush Search Bar: Preserve open folders

Search bar addition is a wonderful feature, but sometimes it messes up organization by closing/opening a lot of folders

It would be great if folder structure would be preserved once search is closed or cancelled.

here are some examples of what I mean