diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 3527bcdd..d9cb489e 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -580,9 +580,14 @@ NSString *const MPDocumentGroupKey                        = @"MPDocumentGroupKey
   switch([MPActionHelper typeForAction:[anItem action]]) {
     case MPActionAddGroup:
       valid &= (nil != self.selectedGroup);
-      // fall-through
+      valid &= (self.trash != self.selectedGroup);
+      valid &= ![self isItemTrashed:self.selectedGroup];
+      break;
     case MPActionAddEntry:
-      // fall-through
+      valid &= (nil != self.selectedGroup);
+      valid &= (self.trash != self.selectedGroup);
+      valid &= ![self isItemTrashed:self.selectedGroup];
+      break;
     case MPActionDelete:
       valid &= (nil != self.selectedItem);
       valid &= (self.trash != self.selectedItem);