Make sure search query doesn't overlap with search button
Merge pull request #3008 from nicolaasmatthijs/issue-3002-long-search-query

Make sure search query doesn't overlap with search button