diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index d2ec5999d..89659f3c3 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -1899,7 +1899,7 @@ static NSNotificationCenter *nc = nil;
   NSView *cacheView;
   NSRect cacheRect;
   
-  aRect = NSIntegralRect (NSIntersectionRect(aRect, [_contentView frame]));
+  aRect = NSIntegralRect (NSIntersectionRect (aRect, [_wv frame]));
   _cachedImageOrigin = aRect.origin;
   DESTROY(_cachedImage);
   
@@ -1929,11 +1929,11 @@ static NSNotificationCenter *nc = nil;
     {
       return;
     }
-  [_contentView lockFocus];
+  [_wv lockFocus];
   NSCopyBits ([[_cachedImage window] gState], 
 	      [_cachedImage rect],
 	      _cachedImageOrigin);
-  [_contentView unlockFocus];
+  [_wv unlockFocus];
 }
 
 - (void) useOptimizedDrawing: (BOOL)flag