Saving now cancels when 'Cancel' is pressed