diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index 7fbc274df..6174980c4 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -2836,6 +2836,8 @@ _isCellEditable (id delegate, NSArray *tableColumns,
 
 - (void) dealloc
 {
+  [self abortEditing];
+
   RELEASE (_gridColor);
   RELEASE (_backgroundColor);
   RELEASE (_tableColumns);