diff --git a/src/js/components/ImageEditor/Canvas.js b/src/js/components/ImageEditor/Canvas.js
index 0ac2411..25e9788 100644
--- a/src/js/components/ImageEditor/Canvas.js
+++ b/src/js/components/ImageEditor/Canvas.js
@@ -163,7 +163,7 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
         var maxWidth = this.getWidth() - 100;
 
         img.scaleToHeight(maxHeight < img.height ? maxHeight : img.height);
-        img.scaleToWidth(maxWidth < (img.width * img.scaleX) ? maxWidth : img.width);
+        img.scaleToWidth(maxWidth < (img.width * img.scaleX) ? maxWidth : img.width * img.scaleX);
 
         return img;
     },