diff --git a/app/assets/javascripts/Components/Result/pdf_viewer.jsx b/app/assets/javascripts/Components/Result/pdf_viewer.jsx
index f787d1e507..b43ebf662a 100644
--- a/app/assets/javascripts/Components/Result/pdf_viewer.jsx
+++ b/app/assets/javascripts/Components/Result/pdf_viewer.jsx
@@ -144,7 +144,7 @@ export class PDFViewer extends React.PureComponent {
     const zoomValuesToDisplayName = this.getZoomValuesToDisplayName();
 
     return (
-      <div>
+      <React.Fragment>
         <div className="toolbar">
           <div className="toolbar-actions">
             {I18n.t("results.current_rotation", {rotation: this.state.rotationInDegrees})}
@@ -169,7 +169,7 @@ export class PDFViewer extends React.PureComponent {
           <div
             id="pdfContainer"
             className="pdfContainer"
-            style={{cursor, userSelect, overflow: "auto"}}
+            style={{cursor, userSelect}}
             ref={this.pdfContainer}
           >
             <div id="viewer" className="pdfViewer" />
@@ -181,7 +181,7 @@ export class PDFViewer extends React.PureComponent {
             />
           </div>
         </div>
-      </div>
+      </React.Fragment>
     );
   }
 }
diff --git a/app/assets/stylesheets/common/pdfjs_custom.scss b/app/assets/stylesheets/common/pdfjs_custom.scss
index 16d0f85172..40b4a39c89 100644
--- a/app/assets/stylesheets/common/pdfjs_custom.scss
+++ b/app/assets/stylesheets/common/pdfjs_custom.scss
@@ -1,5 +1,7 @@
 .pdfContainerParent {
   position: relative;
+  overflow: auto;
+  height: 100%;
 }
 
 .pdfContainer {
diff --git a/app/assets/stylesheets/grader.scss b/app/assets/stylesheets/grader.scss
index fb912513ae..08c853ac44 100644
--- a/app/assets/stylesheets/grader.scss
+++ b/app/assets/stylesheets/grader.scss
@@ -26,15 +26,7 @@
 
 /* Panes content (for controlling the heights) */
 
-#codeviewer {
-  display: flex;
-  flex-basis: 600px;
-  flex-direction: column;
-  flex-grow: 1;
-  width: 100%;
-  overflow: hidden;
-}
-
+#codeviewer,
 #testviewer,
 #mark_viewer,
 #summary_viewer,