Search mode: Back button should exit search

Currently if you go to folder-1/folder-2/Search, hitting the toolbar's back button while in search mode takes you to folder-1.

The expected behavior would be to simply exit the search and return you to your view before the search - folder-2.