diff --git a/module/execution/control.php b/module/execution/control.php
index 394b885125..bba635d556 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -172,6 +172,7 @@ class execution extends control
         $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($this->view->products));
         foreach($tasks as $task)
         {
+            $task->name = htmlspecialchars_decode($task->name);
             if($task->mode == 'multi' && strpos('done,closed', $task->status) === false)
             {
                 $task->assignedTo = '';
diff --git a/module/execution/js/taskkanban.ui.js b/module/execution/js/taskkanban.ui.js
index bf3989bb75..dbd29b5e20 100644
--- a/module/execution/js/taskkanban.ui.js
+++ b/module/execution/js/taskkanban.ui.js
@@ -300,8 +300,8 @@ window.getItem = function(info)
             label = "<span class='label gray-pale rounded p-0 size-sm whitespace-nowrap'>" + childrenAB + "</span> ";
         }
 
-        if(label && typeof info.item.title == 'string')      info.item.title      = {html: label + info.item.title};
-        else if(label && typeof info.item.title == 'object') info.item.title.html = label + info.item.title.html;
+        if(typeof info.item.title == 'string') info.item.title = {html: info.item.title};
+        if(label && typeof info.item.title == 'object') info.item.title.html = label + info.item.title.html;
     }
 
     if(['story', 'epic', 'requirement', 'parentStory'].includes(info.laneInfo.type))