Disable search button fix, CORE-609

Thanks! Merging.

PS: You don't need to create a separate PR, just split the changes into multiple commits and it will be fine.