The Firefox Google Search link fix add-on seems to do a decent job.