diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
index f5ad1b91acdbfcf0fb75f24ba254c743370a4d3b..83b06e9567873787c14115eb8f13e581d9fc9e8f 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
@@ -22,17 +22,17 @@ QCheckBox { //This is a special CheckBox that does color coding for states
 
    Script {
        function evaluate() {
-           if (baseStateFlag) {
-               if (backendValue.isInModel)
+            if (baseStateFlag) {
+                if (backendValue != null && backendValue.isInModel)
                     CheckBox.setStyleSheet("color: white;");
-               else
-                   CheckBox.setStyleSheet("color: gray;");
-           } else {
-               if (backendValue.IsInSubState)
-                   CheckBox.setStyleSheet("color: blue;");
-               else
-                   CheckBox.setStyleSheet("color: gray;");
-          }
-       }
+                else
+                    CheckBox.setStyleSheet("color: gray;");
+            } else {
+                if (backendValue != null && backendValue.isInSubState)
+                    CheckBox.setStyleSheet("color: #7799FF;");
+                else
+                    CheckBox.setStyleSheet("color: gray;");
+            }
+		}
    }
 }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
index d79268047994251c196bb6137b8f0a784668e245..9827d7e58a12daf7c147354a56e1099384ded2b6 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
@@ -31,7 +31,7 @@ QWidget { //This is a special DoubleSpinBox that does color coding for states
                 DoubleSpinBox.setStyleSheet("color: gray;");
                 } else {
                 if (backendValue != null && backendValue.isInSubState)
-                DoubleSpinBox.setStyleSheet("color: blue;");
+                DoubleSpinBox.setStyleSheet("color: #7799FF;");
                 else
                 DoubleSpinBox.setStyleSheet("color: gray;");
                 }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
index 868236afc13e953ccba6c5dee8c0703b38d991fe..5ecefa96a2dd7842f4b49eebe5b2337622d4e91c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
@@ -29,7 +29,7 @@ QWidget { //This is a special SpinBox that does color coding for states
                     SpinBox.setStyleSheet("color: gray;");
             } else {
                 if (backendValue != null && backendValue.isInSubState)
-                    SpinBox.setStyleSheet("color: blue;");
+                    SpinBox.setStyleSheet("color: #7799FF;");
                 else
                     SpinBox.setStyleSheet("color: gray;");
             }