diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 60ded9f7a..62b4f0849 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -5139,7 +5139,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 {
     [super viewWillMoveToWindow:aWindow];
 
-    [self _stopObservingFirstResponderForWindow:aWindow];
+    [self _stopObservingFirstResponderForWindow:[self window]];
 
     if (aWindow)
         [self _startObservingFirstResponderForWindow:aWindow];