Revert to initial popup-fix solution wrt #37