Dialog: make sure to not skip fields while looking for the next field