Improve ChoiceView logic to remove popup.