diff --git a/ChangeLog b/ChangeLog
index 5e9acebb3..0521985e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-25  Matt Rice <ratmice@yahoo.com>
+	
+	* Source/NSScrollView.m: Remove corner view when we have one, but no 
+	vertical scroller. (Fixes #10501).
+
 2004-09-24  Adam Fedor  <fedor@gnu.org>
 
 	* Documentation/GNUmakefile.postamble: Clean up files properly
diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index 9e20525d6..47a832bad 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -1343,6 +1343,12 @@ static float scrollerWidth;
         }
       _cornerView = aView;
     }
+  else if (_cornerView != nil)
+    {
+      [self removeSubview: _cornerView];
+      _cornerView = nil;
+      _hasCornerView = NO;
+    }
 }
 
 @end