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