diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index e449d5b00..c2acb6ead 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -461,6 +461,23 @@ static Class rulerViewClass = nil;
 			 knobProportion: knobProportion];
 	}
     }
+
+  if (_hasHeaderView)
+    {
+      NSPoint headerClipViewOrigin;
+      
+      headerClipViewOrigin = [_headerClipView bounds].origin;
+
+      // If needed, scroll the headerview too
+      if (headerClipViewOrigin.x != clipViewBounds.origin.x)
+	{
+	  headerClipViewOrigin.x = clipViewBounds.origin.x;
+	  headerClipViewOrigin = [_headerClipView constrainScrollPoint: 
+						    headerClipViewOrigin];
+	  [_headerClipView scrollToPoint: headerClipViewOrigin];
+	}
+    }
+  
 }
 
 - (void) setHorizontalRulerView: (NSRulerView*)aRulerView	// FIX ME