Fix "Cancel","Escape" issue