diff --git a/client/components/lists/list.css b/client/components/lists/list.css
index f197f7de5..502cc60d3 100644
--- a/client/components/lists/list.css
+++ b/client/components/lists/list.css
@@ -7,12 +7,14 @@
   border-left: 1px solid #ccc;
   padding: 0;
   float: left;
+  flex: 1;
 }
 [id^="swimlane-"] .list:first-child {
   min-width: 20px;
 }
 .list:first-child {
   border-left: none;
+  flex: none;
 }
 .card-details + .list {
   border-left: none;
@@ -31,6 +33,9 @@
   box-shadow: none;
   height: 100px;
 }
+.list.list-collapsed {
+  flex: none;
+}
 .list.list-composer .open-list-composer,
 .list .list-composer .open-list-composer {
   color: #8c8c8c;
diff --git a/client/components/lists/list.jade b/client/components/lists/list.jade
index e7f06c6ca..1b03f1d93 100644
--- a/client/components/lists/list.jade
+++ b/client/components/lists/list.jade
@@ -1,6 +1,6 @@
 template(name='list')
   .list.js-list(id="js-list-{{_id}}"
-                style="{{#unless collapsed}}width:{{listWidth}}px;{{/unless}}"
+                style="{{#unless collapsed}}max-width:{{listWidth}}px;{{/unless}}"
                 class="{{#if collapsed}}list-collapsed{{/if}}")
     +listHeader
     +listBody
diff --git a/client/components/swimlanes/swimlanes.css b/client/components/swimlanes/swimlanes.css
index 9fb0ad275..373de8ab3 100644
--- a/client/components/swimlanes/swimlanes.css
+++ b/client/components/swimlanes/swimlanes.css
@@ -1,8 +1,3 @@
-@media screen and (min-width: 801px) {
-  .swimlane.ui-sortable {
-    width: max-content;
-  }
-}
 [class=swimlane] {
   position: sticky;
   left: 0;