No Cancel button when adding Variables or editing their values

There is no Cancel button when you add a new variable, nor when you edit an existing Variables value. You have to use the Escape key to cancel out of the dialogs. This is inconsistent with the UX elsewhere, e.g. when configuring processor properties or working with Parameters