Fix cancel behavior for form controls