diff --git a/ChangeLog b/ChangeLog
index f6031b6ef..69cecd161 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-29  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
+	* Source/NSView.m (-dealloc): Fix bug where -dealloc could break
+	the key view chain.
+
 	* Source/NSSavePanel.m (-ok:): Present a warning when the user has
 	entered a filename with a wrong extension.
 
diff --git a/Source/NSView.m b/Source/NSView.m
index ad548a2c8..a0b06c63e 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -583,7 +583,9 @@ GSSetDragTypes(NSView* obj, NSArray *types)
    * First we do the obvious stuff using the standard methods.
    */
   [self setNextKeyView: nil];
-  [[self previousKeyView] setNextKeyView: nil];
+  tmp = [self previousKeyView];
+  if ([tmp nextKeyView] == self)
+    [tmp setNextKeyView: nil];
 
   /*
    * Now, we locate any remaining cases where a view has us as its next