diff --git a/Source/NSClipView.m b/Source/NSClipView.m
index 47909d157..c4af3b46a 100644
--- a/Source/NSClipView.m
+++ b/Source/NSClipView.m
@@ -417,18 +417,21 @@
 - (void) setFrameSize: (NSSize)aSize
 {
   [super setFrameSize: aSize];
+  [self setBoundsOrigin: [self constrainScrollPoint: _bounds.origin]];
   [_super_view reflectScrolledClipView: self];
 }
 
 - (void) setFrameOrigin: (NSPoint)aPoint
 {
   [super setFrameOrigin: aPoint];
+  [self setBoundsOrigin: [self constrainScrollPoint: _bounds.origin]];
   [_super_view reflectScrolledClipView: self];
 }
 
 - (void) setFrame: (NSRect)rect
 {
   [super setFrame: rect];
+  [self setBoundsOrigin: [self constrainScrollPoint: _bounds.origin]];
   [_super_view reflectScrolledClipView: self];
 }