diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
index 22f39b6b7de6..235f0f68dd17 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
@@ -108,7 +108,7 @@ public class QuickFixPreviewPanelFactory {
       }
 
       if (hasComponents) {
-        setBorder(IdeBorderFactory.createEmptyBorder(2, 8, 0, 0));
+        setBorder(IdeBorderFactory.createEmptyBorder(hasFixes ? 2 : 9, (hasFixes || problemCount > 1) ? 8 : 5, hasFixes ? 0 : 8, 0));
       }
       return !hasComponents;
     }