diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index 68d61fb0c..e9ad5ad7f 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -3487,6 +3487,9 @@ static inline float computePeriod(NSPoint mouseLocationWin,
 
 - (BOOL) _startDragOperationWithEvent: (NSEvent *) theEvent clickedRow:(NSUInteger)clickedRow
 {
+  if (clickedRow >= _numberOfRows)
+    return NO;
+	
   NSPasteboard *pboard = [NSPasteboard pasteboardWithName: NSDragPboard];
   NSPoint startPoint = [self convertPoint: [theEvent locationInWindow] 
                                  fromView: nil];