diff --git a/build/js/Layout.js b/build/js/Layout.js
index 7f9cb026c..0e8b4c6ec 100644
--- a/build/js/Layout.js
+++ b/build/js/Layout.js
@@ -97,7 +97,7 @@
     } else {
       var postSetHeight;
 
-      if (windowHeight >= sidebarHeight) {
+      if (windowHeight >= sidebarHeight + headerHeight) {
         $(Selector.contentWrapper).css('min-height', windowHeight - neg);
         postSetHeight = windowHeight - neg;
       } else {
diff --git a/dist/js/adminlte.js b/dist/js/adminlte.js
index 4290bb21c..9165aff28 100644
--- a/dist/js/adminlte.js
+++ b/dist/js/adminlte.js
@@ -614,7 +614,7 @@ throw new Error('AdminLTE requires jQuery')
     } else {
       var postSetHeight;
 
-      if (windowHeight >= sidebarHeight) {
+      if (windowHeight >= sidebarHeight + headerHeight) {
         $(Selector.contentWrapper).css('min-height', windowHeight - neg);
         postSetHeight = windowHeight - neg;
       } else {