diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml
index 5259e5ea75..b9b1a0bac4 100644
--- a/resources/qml/Settings/SettingTextField.qml
+++ b/resources/qml/Settings/SettingTextField.qml
@@ -92,6 +92,8 @@ SettingItem
 
         UM.Label
         {
+            id: unitlabel
+
             anchors
             {
                 left: parent.left
@@ -106,6 +108,16 @@ SettingItem
             horizontalAlignment: (input.effectiveHorizontalAlignment == Text.AlignLeft) ? Text.AlignRight : Text.AlignLeft
             textFormat: Text.PlainText
             color: UM.Theme.getColor("setting_unit")
+
+            Binding
+            {
+                target: unitlabel
+                property: "text"
+                value:
+                {
+                    return propertyProvider.properties.unit;
+                }
+            }
         }
 
         TextInput
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 9622998595..0252d57056 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -321,7 +321,7 @@ Item
 
                 containerStackId: contents.activeMachineId
                 key: model.key
-                watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
+                watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve", "unit" ]
                 storeIndex: 0
                 removeUnusedValue: model.resolve === undefined
             }