Add fix for popups