Issue #21453: Fixed issue with search bar moving off screen
Merge pull request #875 from lynnaloo/21454

Issue #21453: Fixed issue with search bar moving off screen