Attempt to fix edit event flow during validation.