diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp
index 53cecb81d..2e9c551db 100644
--- a/src/libtomahawk/playlist/PlayableProxyModel.cpp
+++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp
@@ -189,7 +189,7 @@ PlayableProxyModel::visibilityFilterAcceptsRow( int sourceRow, const QModelIndex
         return true;
 
     int items = 0;
-    for ( int i = 0; i < sourceRow; i++ )
+    for ( int i = 0; ( i < sourceRow ) && ( items < m_maxVisibleItems ) ; i++ )
     {
         if ( dupeFilterAcceptsRow( i, sourceParent ) && nameFilterAcceptsRow( i, sourceParent ) )
         {