diff --git a/src/filemanager.html b/src/filemanager.html
index 39019484c..d50ac7db3 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -68,10 +68,10 @@
 
   <!-- Modal image/video viewer -->
   <div class="modal fade" id="mediaViewerModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" style="width: calc(100% - 60px); max-width: 1280px; height: 800px; max-height: calc(100% - 60px);">
+    <div class="modal-dialog" style="max-width: 1280px; max-height: calc(100% - 60px);">
       <div class="modal-content" style="height: 100%; height: 100%; display: flex; background-color: #000; background-clip: border-box;">
-        <img ng-show="mediaViewer.type === 'image'" ng-src="{{ mediaViewer.src }}" style="display: block; margin: auto;" />
-        <video ng-show="mediaViewer.type === 'video'" controls preload="auto" autoplay ng-src="{{ mediaViewer.src | trustUrl}}"></video>
+        <img ng-show="mediaViewer.type === 'image'" ng-src="{{ mediaViewer.src }}" style="display: block; margin: auto; max-width: 100%; max-height: 100%;" />
+        <video ng-show="mediaViewer.type === 'video'" controls preload="auto" autoplay ng-src="{{ mediaViewer.src | trustUrl}}" style="display: block; margin: auto; max-width: 100%; max-height: 100%;"></video>
       </div>
     </div>
   </div>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 4b6c96760..8276a8f4a 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -527,11 +527,13 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
         show: function (entry) {
             var filePath = sanitize($scope.cwd + '/' + entry.fileName);
 
+            $scope.mediaViewer.entry = entry;
+            $scope.mediaViewer.type = Mimer().get(entry.fileName).split('/')[0];
+            $scope.mediaViewer.src = '';
+
             Client.filesGet($scope.id, $scope.type, filePath, 'link', function (error, result) {
                 if (error) return Client.error(error);
 
-                $scope.mediaViewer.entry = entry;
-                $scope.mediaViewer.type = Mimer().get(entry.fileName).split('/')[0];
                 $scope.mediaViewer.src = result;
 
                 $('#mediaViewerModal').modal('show');