diff --git a/frontend/src/css/video-file-view.css b/frontend/src/css/video-file-view.css
index 37a00e6291..3d7d4fd33f 100644
--- a/frontend/src/css/video-file-view.css
+++ b/frontend/src/css/video-file-view.css
@@ -1,8 +1,6 @@
-.video-file-view {
-    overflow: auto;
-}
 .video-js {
     width: calc(100% - 40px);
     max-width: 800px;
+    max-height: 100%;
     margin: 0 auto;
 }
diff --git a/frontend/src/shared-file-view-video.js b/frontend/src/shared-file-view-video.js
index 22c3e3af37..ff201d73a0 100644
--- a/frontend/src/shared-file-view-video.js
+++ b/frontend/src/shared-file-view-video.js
@@ -69,6 +69,7 @@ class SharedFileViewVideo extends React.Component {
       const videoJsOptions = { 
         autoplay: false,
         controls: true,
+        preload: 'auto',
         sources: [{
           src: rawPath
         }]  
diff --git a/frontend/src/view-file-video.js b/frontend/src/view-file-video.js
index 26b75a8f31..e485327ede 100644
--- a/frontend/src/view-file-video.js
+++ b/frontend/src/view-file-video.js
@@ -107,6 +107,7 @@ class FileContent extends React.Component {
     const videoJsOptions = {
       autoplay: false,
       controls: true,
+      preload: 'auto',
       sources: [{
         src: rawPath
       }]