Added extra checks in PopupChoiceView to avoid trying to remove popup twice.