Fix for Popup Toggle