Improve behavior of expanded nodes in files view vs search

fixed #1649

review: @devoncarew