Prevent searching during load from breaking the find functionality
Merge pull request #3607 from Snuffleupagus/issue-3604

Prevent searching during load from breaking the find functionality