Overwrite Shift-Return in Autocomplete popup

Will Esc instead, if we have an Esc command.  Otherwise, not handle
Shift-Return.

Would be nicer if it could dismiss the popup and not eat the
Shift-Return command.