Fix search button 'going away' problem (#5254)