UD-234: fix issue after click on cancel