diff --git a/AppKit/CPCollectionView.j b/AppKit/CPCollectionView.j
index 652c0676e..0246ffbe7 100644
--- a/AppKit/CPCollectionView.j
+++ b/AppKit/CPCollectionView.j
@@ -544,7 +544,10 @@ var HORIZONTAL_MARGIN = 2;
             itemSize.width = MIN(maxItemSizeWidth, width);
     }
 
-    numberOfRows = MAX(1.0 , MIN(CEIL(itemsCount / numberOfColumns), _maxNumberOfRows));
+    numberOfRows = CEIL(itemsCount / numberOfColumns);
+
+    if (_maxNumberOfRows > 0)
+        numberOfRows = MIN(numberOfRows, _maxNumberOfRows);
 
     height = MAX(height, numberOfRows * (_minItemSize.height + _verticalMargin));