CRM-13863 Fix group popups