I think this needs to be done for all return keys, not just search.