diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
index 9990ddf8c66..5434e4705bf 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
@@ -103,11 +103,14 @@ Section {
             text: qsTr("State")
         }
         SecondColumnLayout {
-            LineEdit {
+
+            ComboBox {
+                Layout.fillWidth: true
                 backendValue: backendValues.state
-                showTranslateCheckBox: false
-                enabled: anchorBackend.hasParent || isBaseState
+                model: allStateNames
+                valueType: ComboBox.String
             }
+
             ExpandingSpacer {
             }
         }