Fixing Edit dialog