Added proper keyboard navigation support for choices.