diff --git a/QuickLook/GBThumbnailProvider.m b/QuickLook/GBThumbnailProvider.m
index 49a0db63f..34c16db63 100644
--- a/QuickLook/GBThumbnailProvider.m
+++ b/QuickLook/GBThumbnailProvider.m
@@ -12,8 +12,8 @@ extern OSStatus GBQuickLookRender(CGContextRef cgContext, CFURLRef url, bool sho
 {
     CGSize size = {64, 64};
     CGSize maximumSize = request.maximumSize;
-    while (size.width < maximumSize.width / 2 &&
-           size.width < maximumSize.height / 2) {
+    while (size.width <= maximumSize.width / 2 &&
+           size.width <= maximumSize.height / 2) {
         size.width *= 2;
     }
     size.height = size.width;
diff --git a/QuickLook/generator.m b/QuickLook/generator.m
index 225ddc7a0..442423cf5 100644
--- a/QuickLook/generator.m
+++ b/QuickLook/generator.m
@@ -83,6 +83,7 @@ OSStatus GBQuickLookRender(CGContextRef cgContext, CFURLRef url, bool showBorder
                 effectiveTemplate = template;
         }
         
+        CGContextSetInterpolationQuality(cgContext, kCGInterpolationMedium);
         /* Mask it with the template (The middle part of the template image is transparent) */
         [effectiveTemplate drawInRect:(NSRect){{0, 0}, {CGBitmapContextGetWidth(cgContext), CGBitmapContextGetHeight(cgContext)}}];
     }