Reverting closeOnSelect, adding keydown to handle enter to close shortcut