diff --git a/ganttzk/src/main/resources/web/js/ganttz/TaskComponent.js b/ganttzk/src/main/resources/web/js/ganttz/TaskComponent.js
index 9f17a5116..533654b37 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/TaskComponent.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/TaskComponent.js
@@ -213,6 +213,12 @@ ganttz.TaskComponent = zk.$extends(zul.Widget, {
     hideResourceTooltip : function(){
         jq('#'+ this.uuid + ' .task-resources').hide();
     },
+    showLabels : function(){
+        jq('.task-labels',this.$n()).show();
+    },
+    hideLabels : function(){
+        jq('.task-labels',this.$n()).hide();
+    },
     setClass : function(cssClass){
         jq(this.$n()).addClass(cssClass);
     }
diff --git a/ganttzk/src/main/resources/web/js/ganttz/TaskList.js b/ganttzk/src/main/resources/web/js/ganttz/TaskList.js
index 69b9abd35..309afa191 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/TaskList.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/TaskList.js
@@ -6,7 +6,8 @@ ganttz.TaskList = zk.$extends(zk.Widget, {
         this.$class.setInstance(this);
     },
     showAllTaskLabels : function(){
-        jq('.task-labels').css('display','inline');
+        for(var child = this.firstChild; child; child = child.nextSibling)
+            child.showLabels();
     },
     hideAllTaskLabels : function(){
         jq('.task-labels').css('display','none');
diff --git a/ganttzk/src/main/resources/web/js/ganttz/TaskRow.js b/ganttzk/src/main/resources/web/js/ganttz/TaskRow.js
index b4a9dc9aa..c4a85ac6f 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/TaskRow.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/TaskRow.js
@@ -1,6 +1,15 @@
 zk.$package("ganttz");
 
 ganttz.TaskRow = zk.$extends(zk.Widget, {
+    _labelsHidden : true,
+    showLabels : function(){
+        this._labelsHidden = false;
+        this.firstChild.showLabels();
+    },
+    hideLabels : function(){
+        this._labelsHidden = true;
+        this.firstChild.hideLabels();
+    },
     hideResourceTooltip : function(){
         this.firstChild.hideResourceTooltip();
     },
diff --git a/ganttzk/src/main/resources/web/js/ganttz/mold/task-component.js b/ganttzk/src/main/resources/web/js/ganttz/mold/task-component.js
index ac015b1bf..1c71cbab7 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/mold/task-component.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/mold/task-component.js
@@ -3,7 +3,9 @@ function(out){
             ' z.type="ganttz.task.Task" idTask="', this.id,'"',
             ' class="box" >');
 
-        out.push('<div class="task-labels">', this.getLabelsText(),'</div>');
+        out.push('<div class="task-labels" ',
+                this.parent._labelsHidden?'>':'style="display:block;">',
+                this.getLabelsText(),'</div>');
         out.push('<div class="task-resources">');
             out.push('<div class="task-resources-inner">', this.getResourcesText(),'</div>');
         out.push('</div>');