[Popup] Fixed problem with the second advent of Popup