Cancel button is broken for ChoiceStateEditView

Clicking cancel confuses the choice endpoints, since they lose their target element temporarily.