diff --git a/ChangeLog b/ChangeLog
index 69599358b..aa37dda7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Source/NSOutlineView.m (-drawRow:clipRect:): Changed order of
 	expresions in condition to avoid possible access to uninitialized memory.
+	* Source/NSScrollView.m (-initWithCoder:): Don't set _hasCornerView.
 
 2009-03-18 Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index bc0bf9505..035eb76fe 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -1107,7 +1107,7 @@ static float scrollerWidth;
   /* Now place the corner view.  */
   if (_hasCornerView)
     {
-      NSPoint        p = headerRect.origin;
+      NSPoint p = headerRect.origin;
 
       if (verticalScrollerEdge == NSMaxXEdge)
         {
@@ -1593,7 +1593,6 @@ static float scrollerWidth;
       if ([aDecoder containsValueForKey: @"NSHeaderClipView"])
         {
           _hasHeaderView = YES;
-          _hasCornerView = YES;          
           _headerClipView = [aDecoder decodeObjectForKey: @"NSHeaderClipView"];
         }