diff --git a/media/css/file_view_extra.css b/media/css/file_view_extra.css
index 6297569834..ea98dc8031 100644
--- a/media/css/file_view_extra.css
+++ b/media/css/file_view_extra.css
@@ -1,5 +1,6 @@
 #main {
     width:100%;
+    min-height:0;
 }
 #view-hd,
 #view-path-op,
diff --git a/seahub/templates/shared_file_view.html b/seahub/templates/shared_file_view.html
index 68789f5b59..99bbc840c6 100644
--- a/seahub/templates/shared_file_view.html
+++ b/seahub/templates/shared_file_view.html
@@ -71,16 +71,18 @@ $(function() {
     {% endif %}
 });
 
+{% if filetype == 'PDF' and use_pdfjs %}
+{% elif filetype == 'PDF' and not use_pdfjs and not html_exists %}
+{% elif filetype == 'Document' and not html_exists %}
+{% else %}
 function setFileViewAreaHeight() {
     var file_view = $('#file-view');
     if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) {
         file_view.outerHeight($(window).height() - file_view.offset().top);
     }
-    if ($(document).height() > $(window).height()) {
-        file_view.outerHeight($(document).height() - file_view.offset().top);
-    }
 }
 $(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight);
+{% endif %}
 
 {% if request.user.is_authenticated and request.user.username != shared_by %}
 $('#save').click(function() {
diff --git a/seahub/templates/view_file_base.html b/seahub/templates/view_file_base.html
index a5f5741334..25dcae0355 100644
--- a/seahub/templates/view_file_base.html
+++ b/seahub/templates/view_file_base.html
@@ -174,16 +174,19 @@ function setToolbarPos() {
 })();
 $(window).load(setToolbarPos).resize(setToolbarPos);
 
+{% if filetype == 'PDF' and use_pdfjs %}
+{% elif filetype == 'PDF' and not use_pdfjs and not html_exists %}
+{% elif filetype == 'Document' and not html_exists %}
+{% else %}
 function setFileViewAreaHeight() {
     var file_view = $('#file-view');
     if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) {
         file_view.outerHeight($(window).height() - file_view.offset().top);
     }
-    if ($(document).height() > $(window).height()) {
-        file_view.outerHeight($(document).height() - file_view.offset().top);
-    }
 }
 $(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight);
+{% endif %}
+
 
 $('#history').click(function () {
     window.open($(this).data('url'));
diff --git a/seahub/templates/view_history_file.html b/seahub/templates/view_history_file.html
index 1a4176ae47..07400efbbd 100644
--- a/seahub/templates/view_history_file.html
+++ b/seahub/templates/view_history_file.html
@@ -48,16 +48,18 @@ $(function() {
     $('#file-view-tip').append('<a href="' + dld_url + '" class="big-obv-btn">' + "{% trans "Download" %}" + '</a>');
 });
 
+{% if filetype == 'PDF' and use_pdfjs %}
+{% elif filetype == 'PDF' and not use_pdfjs and not html_exists %}
+{% elif filetype == 'Document' and not html_exists %}
+{% else %}
 function setFileViewAreaHeight() {
     var file_view = $('#file-view');
     if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) {
         file_view.outerHeight($(window).height() - file_view.offset().top);
     }
-    if ($(document).height() > $(window).height()) {
-        file_view.outerHeight($(document).height() - file_view.offset().top);
-    }
 }
 $(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight);
+{% endif %}
 
 {% include "snippets/file_content_js.html" %}