diff --git a/ChangeLog b/ChangeLog
index ed4367e73..f1ceb921c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-12 18:26-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Source/NSDrawer.m: Changed - (void) stopTimer.  Fixed to
+	prevent a crash when the drawer is opened/closed and then the
+	window is then closed causing a double release.  
+	
 2009-08-12 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSTextStorage.m (-classForCoder, -initWithCoder:,
diff --git a/Source/NSDrawer.m b/Source/NSDrawer.m
index aaa29d8b0..bcebf8a63 100644
--- a/Source/NSDrawer.m
+++ b/Source/NSDrawer.m
@@ -218,7 +218,11 @@ static NSNotificationCenter *nc = nil;
 
 - (void) stopTimer
 {
-  [_timer invalidate];
+  if(_timer != nil)
+    {
+      [_timer invalidate];
+      DESTROY(_timer);
+    }
 }
 
 - (void) orderFrontRegardless