With FF 23 searching in the location bar performs a search with the currently selected engine in the search bar. I find the behaviour annoying, as I sometimes select different engines in the search bar if needed, but most often I just need quick google searches that I perform from the location bar wihout need to change the search engine.

Is there a way to customise the behaviour, so that the search in the location bar points always to one engine, independently from the engine that is selected in the search bar?