diff --git a/ChangeLog b/ChangeLog
index e1129ec19..cd1cda99e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-28  Matt Rice  <ratmice@gmail.com>
+	
+	* Source/NSTableView.m (-textDidEndEditing:): Handle
+	NSIllegalTextMovement.
+
 2007-01-27  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSMenuItemCell.h: Remove ivar
diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index e814e8e4d..283bbb29a 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -5231,6 +5231,8 @@ static BOOL selectContiguousRegion(NSTableView *self,
     {
       switch ([(NSNumber *)textMovement intValue])
 	{
+	case NSIllegalTextMovement:
+	  [self abortEditing];  
 	case NSReturnTextMovement:
 	  [self _editNextCellAfterRow: row inColumn: column];
 	  // Send action ?