diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
index 30dbeccea9e..f2df9c0d042 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
@@ -386,6 +386,7 @@ SecondColumnLayout {
 
                             property ListModel items: ListModel {}
 
+                            enabled: isBaseState
                             implicitWidth: StudioTheme.Values.colorEditorPopupCmoboBoxWidth
                             width: implicitWidth
                             actionIndicatorVisible: false
@@ -442,6 +443,13 @@ SecondColumnLayout {
                                 }
                                 colorEditor.updateThumbnail()
                             }
+
+                            ToolTipArea {
+                                enabled: !isBaseState
+                                anchors.fill: parent
+                                tooltip: qsTr("Fill type can only be changed in base state.")
+                                z: 10
+                            }
                         }
 
                         ExpandingSpacer {}