diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml
index 5b051178b1..feca1d51a1 100644
--- a/resources/qml/Settings/SettingTextField.qml
+++ b/resources/qml/Settings/SettingTextField.qml
@@ -60,7 +60,7 @@ SettingItem
         color: {
             if(!enabled)
             {
-                return UM.Theme.getColor("text_field")
+                return UM.Theme.getColor("setting_control_disabled")
             }
             switch(propertyProvider.properties.validationState)
             {
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 86d9766d1b..cd889acbf3 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -313,7 +313,7 @@
         "setting_control_text": [35, 35, 35, 255],
         "setting_control_button": [102, 102, 102, 255],
         "setting_control_button_hover": [8, 7, 63, 255],
-        "setting_control_disabled": [245, 245, 245, 255],
+        "setting_control_disabled": "background_2",
         "setting_control_disabled_text": [127, 127, 127, 255],
         "setting_control_disabled_border": [127, 127, 127, 255],
         "setting_unit": [127, 127, 127, 255],
@@ -364,7 +364,7 @@
         "text_field": "background_1",
         "text_field_border": [180, 180, 180, 255],
         "text_field_border_hovered": "border_main",
-        "text_field_border_disabled": "border_main",
+        "text_field_border_disabled": "background_2",
         "text_field_text": "text_default",
         "text_field_text_disabled": "text_disabled",