diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml
index 78575d9f438..6e8b5fa4e1c 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml
@@ -42,7 +42,7 @@ Item {
 
     signal clicked()
 
-    property string tooltip: ""
+    property alias toolTip: toolTipArea.toolTip
 
     width: 24 + leftPadding
     height: 24
@@ -96,28 +96,8 @@ Item {
         anchors.leftMargin: leftPadding
     }
 
-    MouseArea {
-        id: mouseArea
+    ToolTipArea {
         anchors.fill: parent
-        anchors.leftMargin: leftPadding
-        onClicked: {
-            if (buttonRowButton.checked) {
-                buttonRowButton.parent.__unCheckButton(index())
-            } else {
-                buttonRowButton.parent.__checkButton(index())
-            }
-            buttonRowButton.clicked()
-        }
-
-        onExited: Tooltip.hideText()
-        onCanceled: Tooltip.hideText()
-
-        hoverEnabled: true
-
-        Timer {
-            interval: 1000
-            running: mouseArea.containsMouse && tooltip.length
-            onTriggered: Tooltip.showText(mouseArea, Qt.point(mouseArea.mouseX, mouseArea.mouseY), tooltip)
-        }
+        id: toolTipArea
     }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
index 63a21f61380..562c721e499 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
@@ -156,7 +156,7 @@ Column {
                         colorEditor.backendendValue.resetValue()
                         gradientLine.deleteGradient()
                     }
-                    tooltip: qsTr("Solid Color")
+                    toolTip: qsTr("Solid Color")
                 }
                 ButtonRowButton {
                     visible: supportGradient
@@ -166,7 +166,7 @@ Column {
                         gradientLine.addGradient()
                     }
 
-                    tooltip: qsTr("Gradient")
+                    toolTip: qsTr("Gradient")
                 }
                 ButtonRowButton {
                     iconSource: "images/icon_color_none.png"
@@ -174,7 +174,7 @@ Column {
                         colorEditor.color = "#00000000"
                         gradientLine.deleteGradient()
                     }
-                    tooltip: qsTr("Transparent")
+                    toolTip: qsTr("Transparent")
                 }
             }