#87 -- Restored behavior in Popup. One minor caveat is that currently save and continue wouldn't work because the popup state gets lost. Will be updated as soon as I find a practical solution.