Fix popup and event-item events