diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 80de85f013..e6f786f952 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -52,7 +52,7 @@
 
 .region .kanban-lane {position: relative; border-bottom: none!important; min-height: 200px !important}
 
-.region .kanban-lane > .kanban-lane-name > .text {margin: auto 0; max-height: 150px; overflow: hidden; text-overflow: ellipsis}
+.region .kanban-lane > .kanban-lane-name > .text {margin: auto 0;}
 .region .kanban-lane > .kanban-lane-name > .actions {position: absolute; top: 0; left: 0; right: 0; opacity: 0;}
 .region .kanban-lane > .kanban-lane-name > .actions > a {display: block; width: 20px; height: 20px; line-height: 20px; text-align: center; opacity: .7; color: #fff;}
 .region .kanban-lane > .kanban-lane-name > .actions > a:hover {background-color: rgba(0,0,0,.2); opacity: 1;}
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index e12ac5d736..6dab26fba9 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -1266,7 +1266,11 @@ function calcColHeight(col, lane, colCards, colHeight, kanban)
 
     var options = kanban.options;
 
-    if(!options.displayCards) return colHeight;
+    var fontSize        = 13;
+    var moreLabelHeight = 20;
+    var laneNameHeight  = lane.name.length * fontSize;
+
+    if(!options.displayCards) return laneNameHeight > colHeight ? laneNameHeight + 2 * moreLabelHeight : colHeight;
     var displayCards = +(options.displayCards || 2);
 
     if (typeof displayCards !== 'number' || displayCards < 2) displayCards = 2;
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 7075a83218..fac08cbca6 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -318,7 +318,7 @@ $lang->kanbanlane->confirmDeleteTip = 'Are you sure to delete this lane? After d
 $lang->kanbanlane->modeList['sameAsOther'] = 'Use the same Kanban column';
 $lang->kanbanlane->modeList['independent'] = 'Independent Kanban column';
 
-$lang->kanbanlane->heightTypeList['auto']   = 'Adaptive (Adaptive according to the card height)';
+$lang->kanbanlane->heightTypeList['auto']   = 'Adaptive (Adaptive to card height and lane name height)';
 $lang->kanbanlane->heightTypeList['custom'] = 'Custom (Customize lane height based on number of cards)';
 
 $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 773be7451e..2922cf5ac4 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -318,7 +318,7 @@ $lang->kanbanlane->confirmDeleteTip = '您确认删除该泳道吗？删除泳
 $lang->kanbanlane->modeList['sameAsOther'] = '与其他泳道使用相同看板列';
 $lang->kanbanlane->modeList['independent'] = '采用独立的看板列';
 
-$lang->kanbanlane->heightTypeList['auto']   = '自适应（根据卡片高度自适应）';
+$lang->kanbanlane->heightTypeList['auto']   = '自适应（根据卡片高度和泳道名称高度自适应）';
 $lang->kanbanlane->heightTypeList['custom'] = '自定义（根据卡片数量自定义泳道高度）';
 
 $lang->kanbancolumn->fluidBoardList['0'] = '固定列宽';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index edd56df97e..f79345761f 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -3071,7 +3071,7 @@ class kanbanModel extends model
             if(common::hasPriv('kanban', 'setColumnWidth') and $CRKanban) $columnActions .= '<li>' . html::a(helper::createLink('kanban', 'setColumnWidth', "kanbanID=$kanban->id", '', true), '<i class="icon icon-size-width"></i>' . $this->lang->kanban->columnWidth, '', "class='iframe btn btn-link' data-width=400") . '</li>';
             if($printSetHeightBtn and $CRKanban)
             {
-                $width = $this->app->getClientLang() == 'en' ? '750' : '650';
+                $width = $this->app->getClientLang() == 'en' ? '920' : '770';
                 $columnActions .= '<li>' . html::a(helper::createLink('kanban', 'setLaneHeight', "kanbanID=$kanban->id", '', true), '<i class="icon icon-size-height"></i>' . $this->lang->kanban->laneHeight, '', "class='iframe btn btn-link' data-width='$width'") . '</li>';
             }
             $actions .= $columnActions;