Fix custom data popup CRM-12403