diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 226778219..695125dad 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -94,6 +94,11 @@
         }
     }
 
+    .cp-kanban-edit-modal {
+        display: flex;
+        flex-flow: column;
+        overflow: hidden;
+    }
     #cp-kanban-edit-body {
         border: 1px solid @colortheme_modal-input;
         .CodeMirror {
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index d0a38d10a..17e0e278e 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -240,6 +240,7 @@ define([
                 $colors.find('.cp-kanban-palette').removeClass('fa-check');
                 var $col = $colors.find('.cp-kanban-palette-'+(color || 'nocolor'));
                 $col.addClass('fa-check');
+                selectedColor = color;
             }
         };
 
@@ -292,6 +293,7 @@ define([
         var modal = UI.dialog.customModal(content, {
             buttons: button
         });
+        modal.classList.add('cp-kanban-edit-modal');
 
         onRemoteChange.reg(function () {
             if (isBoard) {