diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index 19830951b..0118a3c5c 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -490,6 +490,7 @@ void FileCatalog::exifInfoButtonToggled()
     }
 
     fileBrowser->refreshThumbImages ();
+    refreshHeight();
 }
 
 void FileCatalog::on_realize()
diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index 2d27550bc..583c42968 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -501,8 +501,8 @@ void ThumbBrowserBase::configScrollBars ()
         vscroll.get_adjustment()->set_upper (inH);
         hscroll.get_adjustment()->set_lower (0);
         vscroll.get_adjustment()->set_lower (0);
-        hscroll.get_adjustment()->set_step_increment (32);
-        vscroll.get_adjustment()->set_step_increment (32);
+        hscroll.get_adjustment()->set_step_increment (!fd.empty() ? fd[0]->getEffectiveHeight() : 0);
+        vscroll.get_adjustment()->set_step_increment (!fd.empty() ? fd[0]->getEffectiveHeight() : 0);
         hscroll.get_adjustment()->set_page_increment (iw);
         vscroll.get_adjustment()->set_page_increment (ih);
         hscroll.get_adjustment()->set_page_size (iw);
@@ -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();
     }
 }
 
@@ -567,7 +570,7 @@ void ThumbBrowserBase::arrangeFiles()
 
         MYREADERLOCK_RELEASE(l);
         // This will require a Writer access
-        resizeThumbnailArea(currx, rowHeight);
+        resizeThumbnailArea(currx, !fd.empty() ? fd[0]->getEffectiveHeight() : rowHeight);
     } else {
         const int availWidth = internal.get_width();