diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index 56e4b9358..b568e6bdf 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -492,7 +492,8 @@ void ThumbBrowserBase::refreshThumbImages () {
     for (int i=0; i<fd.size(); i++){
     	previewHeight = getCurrentThumbSize();
     	fd[i]->resize (previewHeight);// TODO!!! Might be performance bottleneck
-        fd[i]->refreshThumbnailImage ();  // TODO: This might cause crashes on some installations
+		/* called if necessary by resize()
+        fd[i]->refreshThumbnailImage ();  TODO: This might cause crashes on some installations */
     }
 
     redraw ();
diff --git a/rtgui/thumbbrowserentrybase.cc b/rtgui/thumbbrowserentrybase.cc
index 7d3f23035..7ad008ebd 100644
--- a/rtgui/thumbbrowserentrybase.cc
+++ b/rtgui/thumbbrowserentrybase.cc
@@ -22,7 +22,7 @@
 #include <mytime.h>
 
 ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname) 
-    : preview(NULL), buttonSet(NULL), exp_width(0), exp_height(0), redrawRequests(0),
+    : preh(0), preview(NULL), buttonSet(NULL), exp_width(0), exp_height(0), redrawRequests(0),
       parent(NULL), filename(fname), exifline(""), datetimeline(""), selected(false),
       drawable(false),framed(false), processing(false), italicstyle(false),
       updatepriority(false) {
@@ -255,9 +255,8 @@ void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh) {
 
 void ThumbBrowserEntryBase::resize (int h) {
     
-    delete [] preview;
-    preview = NULL;
     height = h;
+    int old_preh = preh;
 
     // dimensions of the button set
     int bsw=0, bsh=0;
@@ -285,9 +284,17 @@ void ThumbBrowserEntryBase::resize (int h) {
         if (width < bsw + 2*sideMargin + 2*borderWidth)
             width = bsw + 2*sideMargin + 2*borderWidth;
     }
-//    updateBackBuffer ();
 
-    refreshThumbnailImage ();
+    if ( preh == old_preh )
+    {
+        updateBackBuffer ();
+    }
+    else
+    {
+        delete [] preview;
+        preview = NULL;
+        refreshThumbnailImage ();
+    }
     drawable = true;
 }