CAL-305 fix contextual menu