Cancel button in Add New dialog now works correctly.