diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.ts
index 238b679ae4..5656f3ea10 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.ts
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.ts
@@ -113,12 +113,26 @@ export class PdfViewerComponent {
         this.currentScaleMode = scaleMode;
 
         if (this.pdfViewer) {
+
+            let viewerContainer = document.getElementById('viewer-main-container');
             let documentContainer = document.getElementById('viewer-pdf-container');
+
+            let widthContainer;
+            let heigthContainer;
+
+            if (viewerContainer.clientWidth <= documentContainer.clientWidth) {
+                widthContainer = viewerContainer.clientWidth;
+                heigthContainer = viewerContainer.clientHeight;
+            } else {
+                widthContainer = documentContainer.clientWidth;
+                heigthContainer = documentContainer.clientHeight;
+            }
+
             let currentPage = this.pdfViewer._pages[this.pdfViewer._currentPageNumber];
 
             let padding = 20;
-            let pageWidthScale = (documentContainer.clientWidth - padding) / currentPage.width * currentPage.scale;
-            let pageHeightScale = (documentContainer.clientHeight - padding) / currentPage.width * currentPage.scale;
+            let pageWidthScale = (widthContainer - padding) / currentPage.width * currentPage.scale;
+            let pageHeightScale = (heigthContainer - padding) / currentPage.width * currentPage.scale;
 
             let scale;
 
@@ -193,7 +207,6 @@ export class PdfViewerComponent {
      * @returns {boolean}
      */
     isLandscape(width: number, height: number) {
-        console.log('width  ' + width + 'height  ' + height);
         return (width > height);
     }