diff --git a/client/components/lists/list.css b/client/components/lists/list.css
index c328577be..5e503a4d7 100644
--- a/client/components/lists/list.css
+++ b/client/components/lists/list.css
@@ -16,6 +16,7 @@
   /* overflow: auto; - List width and height resizeable */
 }
 .list:first-child {
+  min-width: 20px;
   margin-left: 5px;
   border-left: none;
 }
diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade
index 4f27aa6a8..e517da882 100644
--- a/client/components/swimlanes/swimlanes.jade
+++ b/client/components/swimlanes/swimlanes.jade
@@ -7,20 +7,20 @@ template(name="swimlane")
         if currentListIsInThisSwimlane _id
           +list(currentList)
         unless currentList
-          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 ../_id
             +cardDetails(currentCard)
-        if currentUser.isBoardMember
-          unless currentUser.isCommentOnly
-            +addListForm
 
 template(name="listsGroup")
   .swimlane.list-group.js-lists