Popup: Make it work when built on its own - this time for real