Fix Go search button flickering (regression)

Change-Id: I794e808755cd3b2e186e671048ef592025cf8ea2