diff --git a/ChangeLog b/ChangeLog
index b16a1fc36..3eab0b927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-05 German Arias <germanandre@gmx.es>
+
+	* Source/NSUndoManager.m (-undoActionName): Try first with the name
+	of current group. If not, with the name of last object in undo stack.
+
 2013-11-03 German Arias <germanandre@gmx.es>
 
 	* Source/NSUndoManager.m (-redoMenuTitleForUndoActionName:):
diff --git a/Source/NSUndoManager.m b/Source/NSUndoManager.m
index bc4d7edda..647867c15 100644
--- a/Source/NSUndoManager.m
+++ b/Source/NSUndoManager.m
@@ -944,7 +944,15 @@
     {
       return nil;
     }
-  return [[_undoStack lastObject] actionName];
+
+  if (_group != nil)
+    {
+      return [_group actionName];
+    }
+  else
+    {
+      return [[_undoStack lastObject] actionName];
+    }
 }
 
 /**