close context modal when picking entity (closes #1367)