Fix broken popups