diff --git a/media/css/seahub.css b/media/css/seahub.css
index b2024fe410..22a976fb67 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -2640,8 +2640,8 @@ textarea:-moz-placeholder {/* for FF */
     padding:0;
 }
 #file-view-tip {
-    height: 150px;
-    padding:10px;
+    height:130px;
+    padding:30px 10px 10px;
     width:930px;
     background:#fff;
     text-align:center;
diff --git a/seahub/templates/shared_file_view.html b/seahub/templates/shared_file_view.html
index e62b20d456..68789f5b59 100644
--- a/seahub/templates/shared_file_view.html
+++ b/seahub/templates/shared_file_view.html
@@ -71,6 +71,17 @@ $(function() {
     {% endif %}
 });
 
+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);
+
 {% if request.user.is_authenticated and request.user.username != shared_by %}
 $('#save').click(function() {
     var form = $('#file-save-form'),
diff --git a/seahub/templates/view_file_base.html b/seahub/templates/view_file_base.html
index 44de60fef9..8d57062e23 100644
--- a/seahub/templates/view_file_base.html
+++ b/seahub/templates/view_file_base.html
@@ -219,9 +219,12 @@ $(window).load(function() {
 
 function setFileViewAreaHeight() {
     var file_view = $('#file-view');
-    if ($(window).height() > $('#main').height()) {
+    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);
 
diff --git a/seahub/templates/view_history_file.html b/seahub/templates/view_history_file.html
index 18b32642c5..1a4176ae47 100644
--- a/seahub/templates/view_history_file.html
+++ b/seahub/templates/view_history_file.html
@@ -48,6 +48,17 @@ $(function() {
     $('#file-view-tip').append('<a href="' + dld_url + '" class="big-obv-btn">' + "{% trans "Download" %}" + '</a>');
 });
 
+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);
+
 {% include "snippets/file_content_js.html" %}
 
 $('#back').click(function() {