diff --git a/ChangeLog b/ChangeLog
index 4c6739dac..9ada99510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-08  Doug Simons <doug.simons@testplant.com>
+
+	* Source/NSTextView.m: Fix bizarre behavior with undo/redo
+	actions carrying across between different fields with the
+	fieldEditor.
+
 2014-07-14  Doug Simons <doug.simons@testplant.com>
 
 	* Headers/NSMenu.h
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index 9bface2aa..1b27f3f07 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -1704,6 +1704,11 @@ to make sure syncing is handled properly in all cases.
   [notificationCenter postNotificationName: NSTextDidEndEditingNotification
       object: _notifObject];
 
+  if (_tf.is_field_editor)
+    {
+	  [[self undoManager] removeAllActions];
+	}
+
   return YES;
 }