diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index 30e3ce9ab8..c8d5b07e03 100755
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -66,18 +66,37 @@ QtObject {
                         else if(control.valueWarning)
                         {
                             return Theme.getColor("setting_validation_warning");
-                        } else
+                        }
+                        else
                         {
                             return Theme.getColor("setting_control");
                         }
-                    } else {
+                    }
+                    else
+                    {
                         return Theme.getColor("setting_control_disabled");
                     }
                 }
 
                 border.width: Theme.getSize("default_lining").width
-                border.color: !control.enabled ? Theme.getColor("setting_control_disabled_border") :
-                                control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border")
+                border.color:
+                {
+                    if (control_enabled)
+                    {
+                        if (control.hovered)
+                        {
+                            return Theme.getColor("setting_control_border_highlight");
+                        }
+                        else
+                        {
+                            return Theme.getColor("setting_control_border");
+                        }
+                    }
+                    else
+                    {
+                        return Theme.getColor("setting_control_disabled_border");
+                    }
+                }
                 UM.RecolorImage {
                     id: downArrow
                     anchors.verticalCenter: parent.verticalCenter