diff --git a/ChangeLog b/ChangeLog
index 0cbb5da29..6fc2e5b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05 Doug Simons <doug.simons@testplant.com>
+
+	* Source/NSWindow.m: Fix crash caused by close being called
+	recursively.
+
 2010-04-05 Doug Simons <doug.simons@testplant.com>
 
 	* Source/NSDrawer.m: Fix problem with drawer window being shown
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 54c82b402..e2a8300d0 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2664,6 +2664,7 @@ resetCursorRectsForView(NSView *theView)
 {
   if (_f.has_closed == NO)
     {
+      _f.has_closed = YES;
       CREATE_AUTORELEASE_POOL(pool);
 
       /* The NSWindowCloseNotification might result in us being
@@ -2689,7 +2690,6 @@ resetCursorRectsForView(NSView *theView)
 	}
 
       RELEASE(pool);
-      _f.has_closed = YES;
       RELEASE(self);
     }
 }