diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
index 06b715ddbf8..9c200a23972 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
@@ -134,12 +134,12 @@ T.ComboBox {
         interactive: false
         model: control.model
         Keys.onEscapePressed: comboBoxPopup.close()
+        currentIndex: control.highlightedIndex
 
         delegate: ItemDelegate {
             id: itemDelegate
 
             onClicked: {
-                control.currentIndex = index
                 control.activated(index)
                 comboBoxPopup.close()
             }