diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index 1e0609969..1b5dee7e3 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -619,15 +619,12 @@ function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl, container) {
   newWidth -= padding;
   newHeight = newWidth / ratio ;
   
-  console.log("newWidth = ", newWidth, "container width:", container.innerWidth());
+  console.log("newWidth = ", newWidth, "container width:", container.innerWidth()-padding);
 
-  if (newHeight < 0) {
+  if (newHeight < 0 || newWidth > container.innerWidth()-padding){
     // Doesn't fit on screen anyways?
     newWidth = container.innerWidth()-padding;
     newHeight = newWidth / ratio;
-  } else if (newWidth > container.innerWidth()) {
-    newWidth = container.innerWidth()-padding;
-    newHeight = newWidth / ratio;
   }
   console.log("newWidth = " + newWidth);
   var autoScale = Math.round(newWidth / baseWidth * SCALE_BASE);