Cancel button behavior matches v4. Closes #96.