msc: Refs #2189 Cancel button broken on adv QA