Fixed that edit fields were not reset on cancel