Better handle fancy popups