1 files changed, 6 insertions, 2 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index bd42f76b..7c6f93a7 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -570,11 +570,16 @@ Control {
         onSelectedTextChanged: popup.currentText = selectedText
 
         property string selectedText
+        property int triggeredIndex: -1
         on__SelectedIndexChanged: {
             if (__selectedIndex === -1)
                 popup.currentText = ""
             else
                 updateSelectedText()
+            if (triggeredIndex >= 0 && triggeredIndex == __selectedIndex) {
+                activated(currentIndex)
+                triggeredIndex = -1
+            }
         }
         property string textRole: ""
 
@@ -611,8 +616,7 @@ Control {
                         modelData :
                           ((popup.modelIsArray ? modelData[popup.textRole] : model[popup.textRole]) || '')
                 onTriggered: {
-                    if (index !== currentIndex)
-                        activated(index)
+                    popup.triggeredIndex = index
                     comboBox.editText = text
                 }
                 onTextChanged: if (index === currentIndex) popup.updateSelectedText();