diff --git a/client/components/lists/listsGroup.js b/client/components/lists/listsGroup.js
new file mode 100644
index 000000000..f94f681f4
--- /dev/null
+++ b/client/components/lists/listsGroup.js
@@ -0,0 +1,13 @@
+BlazeComponent.extendComponent({
+  currentCardIsInThisList(listId, swimlaneId) {
+    const currentCard = Cards.findOne(Session.get('currentCard'));
+    const currentBoardId = Session.get('currentBoard');
+    const board = Boards.findOne(currentBoardId);
+    if (board.view === 'board-view-lists')
+      return currentCard && currentCard.listId === listId;
+    else if (board.view === 'board-view-swimlanes')
+      return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
+    else
+      return false;
+  },
+}).register('listsGroup');
diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade
index e6a0cd346..765f6d49e 100644
--- a/client/components/swimlanes/swimlanes.jade
+++ b/client/components/swimlanes/swimlanes.jade
@@ -33,7 +33,7 @@ template(name="listsGroup")
     else
       each currentBoard.lists
         +list(this)
-        if currentCardIsInThisList
+        if currentCardIsInThisList _id null
           +cardDetails(currentCard)
       if currentUser.isBoardMember
         +addListForm
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 68039b177..211f84f25 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -30,7 +30,14 @@ BlazeComponent.extendComponent({
 
   currentCardIsInThisList(listId, swimlaneId) {
     const currentCard = Cards.findOne(Session.get('currentCard'));
-    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
+    const currentBoardId = Session.get('currentBoard');
+    const board = Boards.findOne(currentBoardId);
+    if (board.view === 'board-view-lists')
+      return currentCard && currentCard.listId === listId;
+    else if (board.view === 'board-view-swimlanes')
+      return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
+    else
+      return false;
   },
 
   events() {