Fix #7551

Simply drop out of search mode (back to the original mode) when accepting an empty search-string.
Merge pull request #7558 from mbauman/7551

Fix #7551