Improve ChoiceView logic to remove popup.
Improve ChoiceView logic to remove popup.

jlhughes/foam,jacksonic/foam,jacksonic/foam,foam-framework/foam,foam-framework/foam,foam-framework/foam,osric-the-knight/foam,foam-framework/foam,mdittmer/foam,jlhughes/foam,jacksonic/foam,mdittmer/foam,mdittmer/foam,shepheb/foam,jacksonic/foam,mdittmer/foam,shepheb/foam,foam-framework/foam,jlhughes/foam,osric-the-knight/foam,osric-the-knight/foam,jlhughes/foam,osric-the-knight/foam,shepheb/foam