Fixed onClickCancel event propagation