diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
index e2da3f137840..9f5de6fcdc86 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
@@ -985,8 +985,17 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
       if (myOrientation == SwingConstants.HORIZONTAL) {
         if (myText != null) {
           FontMetrics fontMetrics = getFontMetrics(getFont());
-          return new JBDimension(JBUI.scale(9) + fontMetrics.stringWidth(myText) + JBUI.scale(4),
-                                 Math.max(fontMetrics.getHeight(), JBUI.scale(24)), true);
+
+          Graphics g = getGraphics().create();
+          try {
+            UISettings.setupAntialiasing(g);
+            int textWidth = fontMetrics.getStringBounds(myText, g).getBounds().width;
+            return new JBDimension(JBUI.scale(9) + textWidth + JBUI.scale(4),
+                                   Math.max(fontMetrics.getHeight(), JBUI.scale(24)), true);
+          }
+          finally {
+            g.dispose();
+          }
         }
         else {
           return JBUI.size(7, 24);