Correctly handle Cancel button during update