diff --git a/ChangeLog b/ChangeLog
index d6849de35..96a846372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-19 Doug Simons <doug.simons@testplant.com>
+
+	* Source/NSMatrix.m:
+	Honor sendsActionOnEndEditing setting when editing ended by
+	something other than return. 
+
 2010-04-18 Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Source/NSBrowser.m:
diff --git a/Source/NSMatrix.m b/Source/NSMatrix.m
index 7f9303975..b1a2d1d59 100644
--- a/Source/NSMatrix.m
+++ b/Source/NSMatrix.m
@@ -1773,6 +1773,9 @@ static SEL getSel;
 	    }
 	  break;
 	case NSTabTextMovement:
+          if ([_selectedCell sendsActionOnEndEditing])
+            [self sendAction];
+
 	  if (_tabKeyTraversesCells)
 	    {
 	      if ([self _selectNextSelectableCellAfterRow: _selectedRow
@@ -1793,6 +1796,9 @@ static SEL getSel;
 	    }
 	  break;
 	case NSBacktabTextMovement:
+          if ([_selectedCell sendsActionOnEndEditing])
+            [self sendAction];
+
 	  if (_tabKeyTraversesCells)
 	    {
 	      if ([self _selectPreviousSelectableCellBeforeRow: _selectedRow