Don't save empty measured quantities and custom fields

When adding new measured quantities (or custom fields) for devices, the new and empty measured quantity (or custom field) is immediately saved. When I click the cancel button, after I filled out the details of my new measured quantity, the empty measured quantity is still listed in the device.

I would expect, that after pressing the cancel button, the measured quantity is not available in the device.