diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 8e4e25c56..0677dca7d 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -2770,7 +2770,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes atPoint:(CGPoint)mouseDownPoint
 {
-    return YES;
+    return [rowIndexes count] > 0 && [self numberOfRows] > 0;
 }
 
 /*!