diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GradientLine.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GradientLine.qml
index bc38e006a5a..abd8ff1a83b 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GradientLine.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GradientLine.qml
@@ -39,8 +39,13 @@ Item {
 
     property bool hasGradient: gradientModel.hasGradient
 
+
     property alias gradientPropertyName: gradientModel.gradientPropertyName
 
+    onHasGradientChanged: {
+        colorLine.invalidate()
+    }
+
     onCurrentColorChanged: {
         gradientModel.setColor(colorLine.selectedIndex, currentColor)
         colorLine.invalidate()
@@ -55,6 +60,14 @@ Item {
         gradientModel.deleteGradient()
     }
 
+    Connections {
+        target: modelNodeBackend
+        onSelectionChanged: {
+            colorLine.invalidate()
+            colorLine.select(0)
+        }
+    }
+
     Item {
         id: colorLine
         height: 80
@@ -283,6 +296,7 @@ Item {
                         }
                         parent.y = 20
                         colorLine.invalidate()
+                        colorLine.select(colorLine.selectedIndex)
                     }
                 }
             }