diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m
index 9711d746..b7ffb889 100644
--- a/MacPass/MPOutlineDataSource.m
+++ b/MacPass/MPOutlineDataSource.m
@@ -129,7 +129,11 @@
   KPKGroup *targetGroup = (KPKGroup *)targetItem;
   if(draggedGroup) {
     if(copyItem || (nil == self.localDraggedGroup) ) {
+      /* Add Copy to title */
+      NSString *copyTemplate = NSLocalizedString(@"%@_COPY", "");
+      draggedGroup.name = [NSString stringWithFormat:copyTemplate, draggedGroup.name];
       [targetGroup addGroup:draggedGroup atIndex:index];
+      [targetGroup.undoManager setActionName:NSLocalizedString(@"COPY_GROUP", "")];
       return YES;
     }
     else if(self.localDraggedGroup) {
@@ -143,7 +147,10 @@
   }
   else if(draggedEntry) {
     if(copyItem || (nil == self.localDraggedEntry)) {
+      NSString *copyTemplate = NSLocalizedString(@"%@_COPY", "");
+      draggedEntry.title = [NSString stringWithFormat:copyTemplate, draggedEntry.title];
       [targetGroup addEntry:draggedEntry atIndex:index];
+      [targetGroup.undoManager setActionName:NSLocalizedString(@"COPY_ENTRY", "")];
       return YES;
     }
     else if(self.localDraggedEntry) {
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index df07d233..b54798a1 100644
Binary files a/MacPass/de.lproj/Localizable.strings and b/MacPass/de.lproj/Localizable.strings differ
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 04b90a2c..f36bec6b 100644
Binary files a/MacPass/en.lproj/Localizable.strings and b/MacPass/en.lproj/Localizable.strings differ
diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings
index 60ce3cc2..e8327bbc 100644
Binary files a/MacPass/fr.lproj/Localizable.strings and b/MacPass/fr.lproj/Localizable.strings differ