Popup bugfix