diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index c153dda8a..76f3ad5ea 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -553,7 +553,7 @@ var CPViewFlags                     = { },
 /* @ignore */
 - (void)_setWindow:(CPWindow)aWindow
 {
-    if (_window === aWindow)
+    if (_window === aWindow || !aWindow)
         return;
 
     [[self window] _dirtyKeyViewLoop];