Make sure search query doesn't overlap with search button

See #3002