Disable search button fix, CORE-609