diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6
index b97a00f00f8b4ea04ada3a210475e1d331fc7916..839851a4e75ca45fd97816edeb0e958c2f77a5fa 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js.es6
+++ b/app/assets/javascripts/boards/stores/boards_store.js.es6
@@ -5,8 +5,8 @@
       filters: {
         author_id: null,
         assignee_id: null,
-        milestone_id: null,
-        label: []
+        milestone_title: null,
+        label_name: []
       }
     },
     reset: function () {
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js
index 1bb0b67d0e86519a07bbec16bf33faaa750417b3..d3bee457619e5a07b4d308b3ab6ea8dbf56cb22d 100644
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -300,7 +300,10 @@
             page = $('body').data('page');
             isIssueIndex = page === 'projects:issues:index';
             isMRIndex = page === 'projects:merge_requests:index';
-            if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
+            if (page === 'projects:boards:show') {
+              BoardsStore.state.filters['label_name'] = label.title;
+              return;
+            } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
               if (!$dropdown.hasClass('js-multiselect')) {
                 selectedLabel = label.title;
                 return Issuable.filterResults($dropdown.closest('form'));
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js
index a0b65d20c03425c71954e1b6d3e968f485dd740c..b14bef73da49f58bf01bda4121d1f2c8734c30bb 100644
--- a/app/assets/javascripts/milestone_select.js
+++ b/app/assets/javascripts/milestone_select.js
@@ -102,7 +102,9 @@
             if ($dropdown.hasClass('js-filter-bulk-update')) {
               return;
             }
-            if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
+            if (page === 'projects:boards:show') {
+              BoardsStore.state.filters[$dropdown.data('field-name')] = selected.name;
+            } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
               if (selected.name != null) {
                 selectedMilestone = selected.name;
               } else {
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index 7054cfd73c12135dcb1b9c844f0f01236f5c6e24..c10d221d0170b68c05ebc1309afa2bcf04cc3b32 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -39,6 +39,7 @@
     display: flex;
     min-height: 100vh;
     max-height: 100vh;
+    padding-bottom: 0;
   }
 
   .issue-boards-content {
@@ -73,6 +74,7 @@
   display: flex;
   min-width: 400px;
   max-width: 400px;
+  margin-bottom: 25px;
   padding-right: ($gl-padding / 2);
   padding-left: ($gl-padding / 2);
 }
@@ -183,9 +185,10 @@
 .board-list {
   -webkit-flex: 1;
   flex: 1;
-  margin: 0;
+  margin-bottom: 0;
   padding: 5px;
-  overflow: scroll;
+  overflow-y: scroll;
+  overflow-x: hidden;
 }
 
 .board-list-loading {