diff --git a/src/controls/private/PrivateActionToolButton.qml b/src/controls/private/PrivateActionToolButton.qml
--- a/src/controls/private/PrivateActionToolButton.qml
+++ b/src/controls/private/PrivateActionToolButton.qml
@@ -25,7 +25,7 @@
 Controls.ToolButton {
     id: control
 
-    implicitWidth: showText && ( kirigamiAction ? kirigamiAction.text.length > 0 : text.length > 0) ? Math.max(background.implicitWidth, layout.implicitWidth + 16) : implicitHeight
+    implicitWidth: showText && ( kirigamiAction ? kirigamiAction.text.length > 0 : text.length > 0) ? Math.max(background.implicitWidth, control.background.contentWidth) : implicitHeight
     implicitHeight: background.implicitHeight
 
     hoverEnabled: true
@@ -67,6 +67,7 @@
         Theme.inherit: false
         RowLayout {
             id: layout
+            onImplicitWidthChanged: control.background.contentWidth = implicitWidth + 16
             anchors.centerIn: parent
             Icon {
                 id: mainIcon