diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 00cda28510..4efc7af42c 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -9,9 +9,8 @@
 .dropdown-menu > li {padding: 0 10px;}
 .dropdown-menu > li > a > .icon {position: relative; left: -5px;}
 
-.scrollbar-hover {max-height: 2000px; overflow: scroll !important;}
-
 #kanbanContainer {padding-bottom: 0; margin-bottom: 0;}
+#kanbanContainer.fullscreen {overflow: auto;}
 
 .region {border: 1px solid #dcdcdc; background-color: #fff;}
 .region + .region {margin-top: 20px;}
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 2d8fd1293e..2783c48676 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -34,7 +34,8 @@ function fullScreen()
     {
         var afterEnterFullscreen = function()
         {
-            $('#kanbanContainer').addClass('scrollbar-hover');
+            $('#kanbanContainer').addClass('fullscreen')
+                .on('scroll', tryUpdateKanbanAffix);
             $('.actions').hide();
             $.cookie('isFullScreen', 1);
         };
@@ -71,7 +72,8 @@ function fullScreen()
  */
 function exitFullScreen()
 {
-    $('#mainContent').removeClass('scrollbar-hover');
+    $('#kanbanContainer').removeClass('fullscreen')
+        .off('scroll', tryUpdateKanbanAffix);
     $('.actions').show();
     $.cookie('isFullScreen', 0);
 }