1 files changed, 24 insertions, 23 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
index 839c656d8a..49809cb9d9 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
@@ -174,7 +174,29 @@ Section {
         }
 
         PropertyLabel {
-            text: qsTr("Name")
+            visible: root.showState
+            text: qsTr("State")
+            tooltip: qsTr("Sets the state of the component.")
+        }
+
+        SecondColumnLayout {
+            visible: root.showState
+
+            ComboBox {
+                implicitWidth: StudioTheme.Values.singleControlColumnWidth
+                               + StudioTheme.Values.actionIndicatorWidth
+                width: implicitWidth
+                editable: true
+                backendValue: backendValues.state
+                model: allStateNames
+                valueType: ComboBox.String
+            }
+
+            ExpandingSpacer {}
+        }
+
+        PropertyLabel {
+            text: annotationEditor.hasAuxData ? qsTr("Annotation") : ""
             tooltip: qsTr("Adds a note with a title to explain the component.")
         }
 
@@ -226,6 +248,7 @@ Section {
                 visible: !annotationEditor.hasAuxData
                 buttonIcon: qsTr("Add Annotation")
                 iconFont: StudioTheme.Constants.font
+                tooltip: qsTr("Adds a note with a title to explain the component.")
                 onClicked: annotationEditor.showWidget()
                 onHoveredChanged: annotationEditor.checkAux()
             }
@@ -252,27 +275,5 @@ Section {
                 onCanceled: hideWidget()
             }
         }
-
-        PropertyLabel {
-            visible: root.showState
-            text: qsTr("State")
-            tooltip: qsTr("Sets the state of the component.")
-        }
-
-        SecondColumnLayout {
-            visible: root.showState
-
-            ComboBox {
-                implicitWidth: StudioTheme.Values.singleControlColumnWidth
-                               + StudioTheme.Values.actionIndicatorWidth
-                width: implicitWidth
-                editable: true
-                backendValue: backendValues.state
-                model: allStateNames
-                valueType: ComboBox.String
-            }
-
-            ExpandingSpacer {}
-        }
     }
 }