diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j
index b4fb03a85..b696e351e 100644
--- a/AppKit/CPScrollView.j
+++ b/AppKit/CPScrollView.j
@@ -817,6 +817,8 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
     }
 
     [self reflectScrolledClipView:_contentView];
+    [documentHeaderView setNeedsLayout];
+    [documentHeaderView setNeedsDisplay:YES];
 }
 
 /* @ignore */
diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index e1ffeb2b1..0224fe4e7 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -1513,6 +1513,8 @@ NOT YET IMPLEMENTED
 
     if ([scrollView isKindOfClass:[CPScrollView class]] && [scrollView documentView] === self)
         [scrollView _updateCornerAndHeaderView];
+        
+    [self setNeedsLayout];
 }
 
 // Complexity:
@@ -3501,8 +3503,20 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 {
     [super setNeedsDisplay:aFlag];
     [_tableDrawView setNeedsDisplay:aFlag];
+
+    [[self headerView] setNeedsDisplay:YES];
 }
 
+/*!
+    @ignore
+*/
+- (void)setNeedsLayout
+{
+    [super setNeedsLayout];
+    [[self headerView] setNeedsLayout];
+}
+
+
 /*!
     @ignore
 */