[SoMA] fix bug 17089 (poor 'Cancel' handling)