Backport: [#31036] Search is broken on Chrome #1312 Ref #3724