Popup fix

Popup fix