Index: /Users/team/fluid-repos/fluid-components/src/webapp/fluid-components/js/fluid/InlineEdit.js
===================================================================
--- /Users/team/fluid-repos/fluid-components/src/webapp/fluid-components/js/fluid/InlineEdit.js	(revision 5655)
+++ /Users/team/fluid-repos/fluid-components/src/webapp/fluid-components/js/fluid/InlineEdit.js	(working copy)
@@ -103,6 +103,7 @@
     }
 
     function finish(that) {
+        that.events.onFinish.fire();
         if (that.options.finishedEditing) {
             that.options.finishedEditing(that.editField[0], that.viewEl[0]);
         }
@@ -363,7 +364,8 @@
         events: {
             modelChanged: null,
             onBeginEdit: "preventable",
-            afterBeginEdit: null
+            afterBeginEdit: null,
+            onFinish: null
         },
         
         paddings: {
Index: /Users/team/fluid-repos/fluid-components/src/webapp/fluid-components/js/fluid/Undo.js
===================================================================
--- /Users/team/fluid-repos/fluid-components/src/webapp/fluid-components/js/fluid/Undo.js	(revision 5655)
+++ /Users/team/fluid-repos/fluid-components/src/webapp/fluid-components/js/fluid/Undo.js	(working copy)
@@ -74,8 +74,10 @@
                 that.state = STATE_CHANGED;
                 refreshView(that);
             },
-            onBeginEdit: function () {
-                fluid.model.copyModel(that.initialModel, that.component.model);
+            onFinish: function () {
+                if (that.component.model === that.extremalModel) {
+                    fluid.model.copyModel(that.initialModel, that.component.model);
+                }
             }
         };
     };