diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index b331ba65..1987a378 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -534,6 +534,8 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
 
 - (void)setTree:(KPKTree *)tree {
   if(self.tree != tree) {
+    /* reseting the tree make undo a bit useless */
+    [self.undoManager removeAllActions];
     _tree = tree;
     if(nil == self.treeDelegate) {
       self.treeDelegate = [[MPTreeDelegate alloc] initWithDocument:self];