AUI-1792 Fix bug when canceling field creation followed by editing a field