Popup windows handling support

Next try ;-)