diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index 829aec9f7..583c42968 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -519,6 +519,9 @@ void ThumbBrowserBase::configScrollBars ()
         } else {
             vscroll.show();
         }
+    } else { // hide scrollbars when a filter is applied which returns no files
+        hscroll.hide();
+        vscroll.hide();
     }
 }