diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index 5983f1c3a..abb8ec68d 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -575,6 +575,9 @@ void ThumbBrowserBase::arrangeFiles()
             if (!fd[i]->filtered && colsWidth + fd[i]->getMinimalWidth() <= availWidth) {
                 colsWidth += fd[numOfCols]->getMinimalWidth();
                 ++numOfCols;
+                if(colsWidth > availWidth) {
+                    break;
+                }
             }
         }