diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css
index 3ecf0b2502..d372e3416e 100644
--- a/module/project/css/kanban.css
+++ b/module/project/css/kanban.css
@@ -8,7 +8,7 @@
 .board-item > .info {line-height: 22px; margin-top: 6px;}
 .board-item + .board-item {margin-top: 10px;}
 .board-item .task-left {float: right; font-size: 12px; color: #a6aab8;}
-.boards-wrapper {max-height: 400px; overflow: auto;}
+.boards-wrapper {overflow: auto;}
 .board.can-drop-in {background-color: #fff!important; opacity: 1!important;}
 .c-board.dragging {color: #006af1;}
 .board.drop-to {background-color: #fff0d5!important;}
diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js
index e12431b191..76be824f12 100644
--- a/module/project/js/kanban.js
+++ b/module/project/js/kanban.js
@@ -2,8 +2,10 @@ $(function()
 {
     $('.c-boards').each(function()
     {
+        var height = $(window).height() - $('#header').height() - $('#footer').height() - 40 - 101;
         var $boardsWrapper = $(this).find('.boards-wrapper');
-        if($boardsWrapper.height() < $(this).height())
+        $boardsWrapper.height(height);
+        if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
         {
             $boardsWrapper.find('.boards').css('height', $(this).height());
         }