1 files changed, 12 insertions, 2 deletions
diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml
index 54d59817db..988b7c3782 100644
--- a/resources/qml/Widgets/ComboBox.qml
+++ b/resources/qml/Widgets/ComboBox.qml
@@ -31,12 +31,22 @@ ComboBox
         },
         State
         {
+            name: "active"
+            when: control.activeFocus
+            PropertyChanges
+            {
+                target: background
+                borderColor: UM.Theme.getColor("text_field_border_active")
+                liningColor: UM.Theme.getColor("text_field_border_active")
+            }
+        },
+        State
+        {
             name: "highlighted"
-            when: base.hovered || control.hovered || control.activeFocus
+            when: (base.hovered || control.hovered) && !control.activeFocus
             PropertyChanges
             {
                 target: background
-                borderColor: UM.Theme.getColor("text_field_border_hovered")
                 liningColor: UM.Theme.getColor("text_field_border_hovered")
             }
         }