diff --git a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
index 28b32677908f..bfdffbd695fb 100644
--- a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
+++ b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
@@ -58,13 +58,10 @@ public class IdeBorderFactory {
   }
 
   public static IdeaTitledBorder createTitledBorder(String title, boolean hasBoldFont, boolean hasIndent, boolean hasSmallFont) {
-    Font font = UIUtil.getBorderFont();
+    Font font = UIUtil.getBorderFont(hasSmallFont ? UIUtil.FontSize.SMALL : UIUtil.FontSize.NORMAL);
     if (hasBoldFont) {
       font = font.deriveFont(Font.BOLD);
     }
-    if (hasSmallFont) {
-      font = UIUtil.getFont(UIUtil.FontSize.SMALL, font);
-    }
     int indent = hasIndent ? (hasBoldFont ? 18 : 15) : 0;
     Insets insets = hasBoldFont ? new Insets(5,0,10,0) : new Insets(3,0,6,0);
     return new IdeaTitledBorder(title, font, UIUtil.getBorderColor(), indent, 1, insets);
diff --git a/platform/platform-api/src/com/intellij/ui/TitledSeparator.java b/platform/platform-api/src/com/intellij/ui/TitledSeparator.java
index e54f03de7cdd..585c933eef8e 100644
--- a/platform/platform-api/src/com/intellij/ui/TitledSeparator.java
+++ b/platform/platform-api/src/com/intellij/ui/TitledSeparator.java
@@ -51,9 +51,8 @@ public class TitledSeparator extends JPanel {
     setBorder(IdeBorderFactory.createEmptyBorder(3, 0, 5, 5));
 
     setText(text);
-    setTitleFont(UIUtil.getBorderFont());
-    setBoldFont(boldFont);
     setSmallFont(smallFont);
+    setBoldFont(boldFont);
   }
 
   public String getText() {
@@ -87,7 +86,7 @@ public class TitledSeparator extends JPanel {
 
   public void setSmallFont(boolean smallFont) {
     this.smallFont = smallFont;
-    this.setTitleFont(UIUtil.getFont(smallFont ? UIUtil.FontSize.SMALL : UIUtil.FontSize.NORMAL, this.getTitleFont()));
+    this.setTitleFont(UIUtil.getBorderFont(smallFont ? UIUtil.FontSize.SMALL : UIUtil.FontSize.NORMAL));
   }
 
 }
diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index c1af0a07faab..c46180c872b7 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -289,6 +289,15 @@ public class UIUtil {
     }
   }
 
+  @NotNull
+  public static Font getBorderFont(@NotNull FontSize size) {
+    Font defFont = getBorderFont();
+    if (size == FontSize.SMALL) {
+      return defFont.deriveFont(defFont.getSize() * 0.9f);
+    }
+    return defFont;
+  }
+
   public static Font getLabelFont() {
     return UIManager.getFont("Label.font");
   }