diff --git a/frontend/src/components/file-view/file-view-tip.js b/frontend/src/components/file-view/file-view-tip.js
index d918c2f996..64a6624676 100644
--- a/frontend/src/components/file-view/file-view-tip.js
+++ b/frontend/src/components/file-view/file-view-tip.js
@@ -24,7 +24,7 @@ class FileViewTip extends React.Component {
     }
 
     return (
-      <div className="file-view-content flex-1">
+      <div className="file-view-content flex-1 o-auto">
         <div className="file-view-tip">
           {errorMsg}
           <a href="?dl=1" className="btn btn-secondary">{gettext('Download')}</a>
diff --git a/frontend/src/components/file-view/file-view.js b/frontend/src/components/file-view/file-view.js
index 7d30af3fbc..b314705145 100644
--- a/frontend/src/components/file-view/file-view.js
+++ b/frontend/src/components/file-view/file-view.js
@@ -92,7 +92,7 @@ class FileView extends React.Component {
             toggleCommentPanel={this.toggleCommentPanel}
           />
         </div>
-        <div className="file-view-body flex-auto d-flex">
+        <div className="file-view-body flex-auto d-flex o-hidden">
           {this.props.content}
           {this.state.isCommentPanelOpen &&
             <CommentPanel toggleCommentPanel={this.toggleCommentPanel} />