diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade
index 02f8e8ec7..f6fbaf920 100644
--- a/client/components/swimlanes/swimlanes.jade
+++ b/client/components/swimlanes/swimlanes.jade
@@ -29,20 +29,20 @@ template(name="listsGroup")
       if currentList
         +list(currentList)
       else
-        each lists
-          +miniList(this)
         if currentUser.isBoardMember
           unless currentUser.isCommentOnly
             +addListForm
+        each lists
+          +miniList(this)
     else
+      if currentUser.isBoardMember
+        unless currentUser.isCommentOnly
+          +addListForm
       each lists
         if visible this
           +list(this)
         if currentCardIsInThisList _id null
           +cardDetails(currentCard)
-      if currentUser.isBoardMember
-        unless currentUser.isCommentOnly
-          +addListForm
 
 template(name="addListForm")
   unless currentUser.isWorker