diff --git a/platform/util/src/com/intellij/ui/TitlePanel.java b/platform/util/src/com/intellij/ui/TitlePanel.java
index cff1d0f7e58a..806e0f7dfdd0 100644
--- a/platform/util/src/com/intellij/ui/TitlePanel.java
+++ b/platform/util/src/com/intellij/ui/TitlePanel.java
@@ -48,7 +48,7 @@ public class TitlePanel extends CaptionPanel {
     myLabel.setForeground(JBColor.foreground());
     myLabel.setHorizontalAlignment(SwingConstants.CENTER);
     myLabel.setVerticalAlignment(SwingConstants.CENTER);
-    myLabel.setBorder(JBUI.Borders.empty(1, 2, 2, 2));
+    myLabel.setBorder(JBUI.Borders.empty(1, 10, 2, 10));
 
     add(myLabel, BorderLayout.CENTER);
 
@@ -80,6 +80,7 @@ public class TitlePanel extends CaptionPanel {
     }
 
     final Dimension preferredSize = super.getPreferredSize();
+    preferredSize.height = JBUI.CurrentTheme.Popup.headerHeight();
     int maxWidth = JBUI.scale(350);
     if (!myHtml && preferredSize.width > maxWidth) { // do not allow caption to extend parent container
       return new Dimension(maxWidth, preferredSize.height);
diff --git a/platform/util/src/com/intellij/util/ui/JBUI.java b/platform/util/src/com/intellij/util/ui/JBUI.java
index cb647d4f429d..eee5d7c27d0f 100644
--- a/platform/util/src/com/intellij/util/ui/JBUI.java
+++ b/platform/util/src/com/intellij/util/ui/JBUI.java
@@ -1536,6 +1536,10 @@ public class JBUI {
                : getColor("Popup.Header.inactiveBackground", 0xededed);
       }
 
+      public static int headerHeight() {
+        return scale(24);
+      }
+
       public static Color borderColor(boolean active) {
         return active
                ? getColor("Popup.Border.color", 0x808080)