diff --git a/MacPass/MPEntryTableDataSource.m b/MacPass/MPEntryTableDataSource.m
index 37be0993..bd7f1895 100644
--- a/MacPass/MPEntryTableDataSource.m
+++ b/MacPass/MPEntryTableDataSource.m
@@ -32,7 +32,10 @@
 @implementation MPEntryTableDataSource
 
 - (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard {
-  NSArray *entries = self.viewController.entryArrayController.selectedObjects;
+  NSMutableArray *entries = [[NSMutableArray alloc] initWithCapacity:rowIndexes.count];
+  [rowIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
+    [entries addObject:self.viewController.entryArrayController.arrangedObjects[idx]];
+  }];
   for(KPKEntry *entry in entries) {
     if(![entry isKindOfClass:[KPKEntry class]]) {
       return NO;
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 471228fb..b9ddc5de 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -333,8 +333,8 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
     }
     else if(isHistoryColumn) {
       NSString *historyCountKeyPath = [NSString stringWithFormat:@"%@.%@.@count",
-                                        NSStringFromSelector(@selector(objectValue)),
-                                        NSStringFromSelector(@selector(history))];
+                                       NSStringFromSelector(@selector(objectValue)),
+                                       NSStringFromSelector(@selector(history))];
       [view.textField bind:NSValueBinding toObject:view withKeyPath:historyCountKeyPath options:nil];
     }
   }
@@ -359,11 +359,10 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
 
 #pragma mark MPTargetItemResolving
 - (NSArray<KPKEntry *> *)currentTargetEntries {
-  /*NSInteger activeRow = self.entryTable.clickedRow;
+  NSInteger activeRow = self.entryTable.clickedRow;
   if(activeRow > -1) {
     return @[ [self.entryArrayController arrangedObjects][activeRow] ];
   }
-  */
   return self.entryArrayController.selectedObjects;
 }
 
diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m
index 9d2cde45..2408b7f3 100644
--- a/MacPass/MPOutlineDataSource.m
+++ b/MacPass/MPOutlineDataSource.m
@@ -39,7 +39,7 @@
   if(items.count != 1) {
     return NO;
   }
-  self.localDraggedGroup = nil;  id item = [[items lastObject] representedObject];
+  self.localDraggedGroup = nil;  id item = [items.lastObject representedObject];
   if(![item isKindOfClass:[KPKGroup class]]) {
     return NO;
   }