How do I stop search jumping to URL box in a new tab

Until the most recent update, when I opened a new tab a box with the message "Search the web" appeared, and I could enter a query to search. This was exactly what I wanted. Now, the box still appears, but as soon as I type a character the input jumps to the small box at the top left where I would expect to enter a URL. I don't like this, because (a) the jump is disconcerting when I'm trying to type, (b) I want what I type in the URL box to be always taken as a URL, not as a search query, (c) the box in the middle of the new tab is just a waste of space: something held out then snatched away. The solution I have found suggested is to set the resource browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar to false, but this causes an error message to appear in the search box. I'm sure there must be a way to have the old behaviour back - any help gratefully received.