2 files changed, 3 insertions, 4 deletions
diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade
index 77afa399..e6a0cd34 100644
--- a/client/components/swimlanes/swimlanes.jade
+++ b/client/components/swimlanes/swimlanes.jade
@@ -14,7 +14,7 @@ template(name="swimlane")
     else
       each currentBoard.lists
         +list(this)
-        if currentCardIsInThisList
+        if currentCardIsInThisList _id ../_id
           +cardDetails(currentCard)
       if currentUser.isBoardMember
         +addListForm
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 397f9e9b..68039b17 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -28,10 +28,9 @@ BlazeComponent.extendComponent({
     });
   },
 
-  currentCardIsInThisList() {
+  currentCardIsInThisList(listId, swimlaneId) {
     const currentCard = Cards.findOne(Session.get('currentCard'));
-    const listId = this.currentData()._id;
-    return currentCard && currentCard.listId === listId; //TODO: AND IN THIS SWIMLANE
+    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
   },
 
   events() {