1 files changed, 18 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
index 747a0d4510..1c3dc46c15 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
@@ -244,7 +244,7 @@ T.ComboBox {
         },
         State {
             name: "edit"
-            when: myComboBox.edit && myComboBox.editable
+            when: myComboBox.edit && myComboBox.editable && !comboBoxPopup.opened
             PropertyChanges {
                 target: myComboBox
                 wheelEnabled: true
@@ -252,12 +252,29 @@ T.ComboBox {
             PropertyChanges {
                 target: comboBoxInput
                 selectByMouse: true
+                readOnly: false
             }
             PropertyChanges {
                 target: comboBoxBackground
                 color: StudioTheme.Values.themeInteraction
                 border.color: StudioTheme.Values.themeInteraction
             }
+            StateChangeScript {
+                script: comboBoxPopup.close()
+            }
+        },
+        State {
+            name: "popup"
+            when: myComboBox.edit && comboBoxPopup.opened
+            PropertyChanges {
+                target: myComboBox
+                wheelEnabled: true
+            }
+            PropertyChanges {
+                target: comboBoxInput
+                selectByMouse: false
+                readOnly: true
+            }
         }
     ]