diff --git a/resources/js/pdfjs/pdf_viewer.js b/resources/js/pdfjs/pdf_viewer.js
index d5a94059b8e..6d96e0dfff8 100644
--- a/resources/js/pdfjs/pdf_viewer.js
+++ b/resources/js/pdfjs/pdf_viewer.js
@@ -851,7 +851,7 @@
           }
         }
 
-        function scrollIntoView (element, spot, skipOverflowHiddenElements = false) {
+        function scrollIntoView (element, spot, skipOverflowHiddenElements = true) {
           let parent = element.offsetParent
 
           if (!parent) {
@@ -862,7 +862,10 @@
           let offsetY = element.offsetTop + element.clientTop
           let offsetX = element.offsetLeft + element.clientLeft
 
-          while (parent.clientHeight === parent.scrollHeight && parent.clientWidth === parent.scrollWidth || skipOverflowHiddenElements && getComputedStyle(parent).overflow === 'hidden') {
+          while (parent.clientHeight === parent.scrollHeight &&
+                 parent.clientWidth === parent.scrollWidth ||
+                 skipOverflowHiddenElements &&
+                 getComputedStyle(parent).overflow === 'hidden') {
             if (parent.dataset._scaleY) {
               offsetY /= parent.dataset._scaleY
               offsetX /= parent.dataset._scaleX
diff --git a/src/main/frontend/extensions/pdf/pdf.css b/src/main/frontend/extensions/pdf/pdf.css
index f4e12955e73..cb6f8621981 100644
--- a/src/main/frontend/extensions/pdf/pdf.css
+++ b/src/main/frontend/extensions/pdf/pdf.css
@@ -203,6 +203,8 @@
     }
 
     > .pdfViewer {
+      overflow: hidden;
+
       &.disabled-text-selection {
         user-select: none;
         pointer-events: none;