[FIX] Popup: Clicking on buttons should close the popup
Merge pull request #1634 from vhpoet/release

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