diff --git a/rtgui/batchqueue.cc b/rtgui/batchqueue.cc
index 1708c7445..327f94c8a 100644
--- a/rtgui/batchqueue.cc
+++ b/rtgui/batchqueue.cc
@@ -89,7 +89,7 @@ void BatchQueue::addEntries ( std::vector<BatchQueueEntry*> &entries, bool head)
 
 	for( std::vector<BatchQueueEntry*>::iterator entry = entries.begin(); entry != entries.end();entry++ ){
 		(*entry)->setParent (this);
-		(*entry)->resize (options.thumbSize);
+		(*entry)->resize (MIN(options.thumbSize, getMaxThumbnailHeight()));  // batch queue might have smaller, restricted size
 		Glib::ustring tempFile = getTempFilenameForParams( (*entry)->filename );
 
 		// recovery save
diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index 01c327811..af7506d7d 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -516,7 +516,7 @@ void ThumbBrowserBase::refreshThumbImages () {
 		#endif
 
         int previewHeight = getCurrentThumbSize();
-        for (int i=0; i<fd.size(); i++) fd[i]->resize (previewHeight);// TODO!!! Might be performance bottleneck
+        for (int i=0; i<fd.size(); i++) fd[i]->resize (previewHeight);
 	}
 
     redraw ();