diff --git a/Foundation/CPUndoManager.j b/Foundation/CPUndoManager.j
index 0504a9ab5..c511d093f 100644
--- a/Foundation/CPUndoManager.j
+++ b/Foundation/CPUndoManager.j
@@ -594,6 +594,14 @@ if (_currentGroup == nil)
 */
 - (void)removeAllActions
 {
+    // Close off any groupings.
+    while (_currentGrouping)
+        [self endUndoGrouping];
+
+    // Won't need this anymore
+    [self _unregisterWithRunLoop];
+
+    _state = CPUndoManagerNormal;
     _redoStack = [];
     _undoStack = [];
     _disableCount = 0;