diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index 62bea5df3b..c84018fb07 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -148,8 +148,8 @@ Button
                 // Using parent.width is fine in fixedWidthMode.
                 target: buttonText
                 property: "width"
-                value: button.fixedWidthMode ? button.width - button.leftPadding - button.rightPadding
-                                             : ((maximumWidth != 0 && button.contentWidth > maximumWidth) ? maximumWidth : undefined)
+                value: button.fixedWidthMode ? (button.width - button.leftPadding - button.rightPadding)
+                                             : ((button.maximumWidth != 0 && button.implicitContentWidth > button.maximumWidth) ? (button.maximumWidth - (button.width - button.implicitContentWidth) * 2) : undefined)
             }
         }