diff --git a/Source/NSCell.m b/Source/NSCell.m
index d3bcaab6a..acce736af 100644
--- a/Source/NSCell.m
+++ b/Source/NSCell.m
@@ -64,6 +64,7 @@
 #import "AppKit/NSView.h"
 #import "AppKit/NSWindow.h"
 #import "AppKit/NSKeyValueBinding.h"
+#import "GSBindingHelpers.h"
 #import "GNUstepGUI/GSTheme.h"
 #import "GSGuiPrivate.h"
 
@@ -220,6 +221,8 @@ static NSColor *dtxtCol;
 
 - (void) dealloc
 {
+  // Remove all key value bindings for this object.
+  [GSKeyValueBinding unbindAllForObject: self];
   TEST_RELEASE (_contents);
   TEST_RELEASE (_cell_image);
   TEST_RELEASE (_font);