Improve hero-org-popup behaviour