(MT #3076) make cancel button working on return