Fixed cancel edit for new and existing