Popup close button bugfix