Make search not disappear and work better

R=efortuna@google.com

Review URL: https://chromiumcodereview.appspot.com//82923007