[FIX] Popup: Clicking on buttons should close the popup