fix issue 4872: Can't edit before save