Fixed Popup not closing. Closes #9