diff --git a/web/firefox_print_service.js b/web/firefox_print_service.js
index 1fe961987..54bb2a4a2 100644
--- a/web/firefox_print_service.js
+++ b/web/firefox_print_service.js
@@ -39,6 +39,8 @@ function composePage(
 
   const canvasWrapper = document.createElement("div");
   canvasWrapper.appendChild(canvas);
+  canvasWrapper.style.width = canvas.style.width;
+  canvasWrapper.style.height = canvas.style.height;
   printContainer.appendChild(canvasWrapper);
 
   // A callback for a given page may be executed multiple times for different
diff --git a/web/pdf_print_service.js b/web/pdf_print_service.js
index e269f0398..1071d6fa4 100644
--- a/web/pdf_print_service.js
+++ b/web/pdf_print_service.js
@@ -198,6 +198,8 @@ PDFPrintService.prototype = {
 
     const wrapper = document.createElement("div");
     wrapper.appendChild(img);
+    wrapper.style.width = img.style.width;
+    wrapper.style.height = img.style.height;
     this.printContainer.appendChild(wrapper);
 
     return new Promise(function (resolve, reject) {
diff --git a/web/viewer.css b/web/viewer.css
index a2b905c0e..95b3a30a4 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -1758,12 +1758,9 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
   }
   /* wrapper around (scaled) print canvas elements */
   #printContainer > div {
-    position: relative;
-    top: 0;
-    left: 0;
-    width: 1px;
-    height: 1px;
-    overflow: visible;
+    /* Without the following max-height declaration, Chromium might create extra
+     * blank pages, even though it shouldn't! */
+    max-height: 100%;
     page-break-after: always;
     page-break-inside: avoid;
   }