diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 2d10ca6ce..e853c018c 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -209,12 +209,10 @@
         .kanban-container-outer {
             flex: 1;
             display: flex;
-            align-items: center;
             min-height: 0;
             .kanban-container {
                 flex: 1;
                 display: flex;
-                justify-content: space-around;
                 max-height: 100%;
             }
         }
@@ -233,6 +231,7 @@
                 min-width: 150px;
 
                 &> i {
+                    cursor: pointer;
                     margin-left: 10px;
                 }
                 .cp-kanban-filterTags-name {
@@ -242,6 +241,11 @@
                     margin-left: 10px;
                     display: flex;
                     flex-wrap: wrap;
+                    em {
+                        font-size: 14px;
+                        color: lighten(@cryptpad_text_col, 10%);
+                    }
+
                     span {
                         .tools_unselectable();
                         padding: 0 5px;
@@ -352,11 +356,12 @@
 
         .kanban-board {
             main {
-                min-height: 0;
                 padding: 0 10px;
                 margin: 10px 0;
                 flex: 1;
                 overflow-y: auto;
+                justify-content: space-around;
+                min-height: 50px;
             }
             header {
                 display: flex;
@@ -476,6 +481,9 @@
             .kanban-title-button, #kanban-addboard, .kanban-remove-item, .kanban-additem {
                 display: none !important;
             }
+            #kanban-trash {
+                display: none;
+            }
         }
     }
 
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index d9c4e6671..2c5350069 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -59,6 +59,7 @@ define([
     Messages.kanban_submit = "Submit"; // XXX
     Messages.kanban_delete = "Delete"; // XXX
     Messages.kanban_tags = "Filter tags"; // XXX
+    Messages.kanban_noTags = "No tags"; // XXX
 
 // XXX
 // Conflicts
@@ -758,6 +759,10 @@ define([
             var redrawList = function (allTags) {
                 if (!Array.isArray(allTags)) { return; }
                 $list.empty();
+                if (!allTags.length) {
+                    $list.append(h('em', Messages.kanban_noTags));
+                    return;
+                }
                 allTags.forEach(function (t) {
                     var tag;
                     $list.append(tag = h('span', {