diff --git a/client/components/lists/list.css b/client/components/lists/list.css
index 9afa62004..b94a87f24 100644
--- a/client/components/lists/list.css
+++ b/client/components/lists/list.css
@@ -7,11 +7,13 @@
   border-left: 1px solid #ccc;
   padding: 0;
   float: left;
-  flex: 1;
 }
 [id^="swimlane-"] .list:first-child {
   min-width: 20px;
 }
+.list.list-auto-width {
+  flex: 1;
+}
 .list:first-child {
   border-left: none;
   flex: none;
diff --git a/client/components/lists/list.jade b/client/components/lists/list.jade
index 09129d6ce..e39efcad0 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}}{{#if autoWidth}}min-{{/if}}width:{{listWidth}}px;{{/unless}}"
+                style="{{#unless collapsed}}min-width:{{listWidth}}px;max-width:{{listConstraint}}px;{{/unless}}"
                 class="{{#if collapsed}}list-collapsed{{/if}} {{#if autoWidth}}list-auto-width{{/if}}")
     +listHeader
     +listBody
diff --git a/client/components/lists/list.js b/client/components/lists/list.js
index a3ac18cdb..90c23fa52 100644
--- a/client/components/lists/list.js
+++ b/client/components/lists/list.js
@@ -201,10 +201,16 @@ BlazeComponent.extendComponent({
     return user.getListWidth(list.boardId, list._id);
   },
 
+  listConstraint() {
+    const user = ReactiveCache.getCurrentUser();
+    const list = Template.currentData();
+    return user.getListConstraint(list.boardId, list._id);
+  },
+
   autoWidth() {
     const user = ReactiveCache.getCurrentUser();
     const list = Template.currentData();
-    return user.hasAutoWidth(list.boardId);
+    return user.isAutoWidth(list.boardId);
   },
 }).register('list');