diff --git a/platform/platform-impl/src/com/intellij/ui/components/GradientViewport.java b/platform/platform-impl/src/com/intellij/ui/components/GradientViewport.java
index 1dbe988e369e..3001922e2cfc 100644
--- a/platform/platform-impl/src/com/intellij/ui/components/GradientViewport.java
+++ b/platform/platform-impl/src/com/intellij/ui/components/GradientViewport.java
@@ -80,7 +80,11 @@ public class GradientViewport extends JBViewport {
     Component header = getHeader();
     if (header != null) {
       int h = header.getPreferredSize().height;
-      bounds.y -= h;
+      if (bounds.y < h) {
+        bounds = new Rectangle(bounds);
+        bounds.y -= h;
+        bounds.height += h;
+      }
     }
     super.scrollRectToVisible(bounds);
   }