3 files changed, 19 insertions, 4 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index e00794f3..30e70b31 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -20,5 +20,8 @@ template(name="boardBody")
       class="{{#if draggingActive.get}}is-dragging-active{{/if}}")
       if showOverlay.get
         .board-overlay
-      each currentBoard.swimlanes
-        +swimlane(this)
+      if isViewSwimlanes
+        each currentBoard.swimlanes
+          +swimlane(this)
+      if isViewLists
+        +listsGroup
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index 02174849..a068dd04 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -47,6 +47,18 @@ BlazeComponent.extendComponent({
     return Utils.isMiniScreen() && Session.get('currentCard');
   },
 
+  isViewSwimlanes() {
+    const currentBoardId = Session.get('currentBoard');
+    const board = Boards.findOne(currentBoardId);
+    return (board.view === 'board-view-swimlanes');
+  },
+
+  isViewLists() {
+    const currentBoardId = Session.get('currentBoard');
+    const board = Boards.findOne(currentBoardId);
+    return (board.view === 'board-view-lists');
+  },
+
   events() {
     return [{
       // XXX The board-overlay div should probably be moved to the parent
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 4cc582b1..67b05446 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -82,13 +82,13 @@ BlazeComponent.extendComponent({
           Boards.update(currentBoard._id, {
             $set: {
               view: 'board-view-lists',
-            }
+            },
           });
         } else if (currentBoard.view === 'board-view-lists') {
           Boards.update(currentBoard._id, {
             $set: {
               view: 'board-view-swimlanes',
-            }
+            },
           });
         }
       },