Cannot Edit Customer Goals

When I try to edit existing Customer Goals I do not have an option to save and I receive an “error” message on the Company field. In order for me to make a change I have to delete and re-add a new goal. This seems like a bug with the Company field. Can this be fixed so existing goals can be edited?