diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index bcfd35831..ff9631031 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -766,11 +766,11 @@ public class Planner extends HtmlMacroComponent  {
         getDependencyList().redrawDependencies();
 
         if (isShowingLabels) {
-            Clients.evalJavaScript("zkTasklist.showAllTooltips();");
+            Clients.evalJavaScript("ganttz.TaskList.getInstance().showAllTaskLabels();");
         }
 
         if (isShowingResources) {
-            Clients.evalJavaScript("zkTasklist.showResourceTooltips();");
+            Clients.evalJavaScript("ganttz.TaskList.getInstance().showResourceTooltips();");
         }
     }
 
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java
index 2aec094fd..ff9a949bf 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java
@@ -139,7 +139,7 @@ public class TaskContainer extends Task {
     private void refreshTooltips() {
         // Could be optimized asking planner for tooltips display state to
         // create expanded elements with the proper state
-        Clients.evalJavaScript("zkTasklist.refreshTooltips();");
+        Clients.evalJavaScript("ganttz.TaskList.getInstance().refreshTooltips();");
     }
 
     @Override
diff --git a/ganttzk/src/main/resources/web/js/ganttz/TaskList.js b/ganttzk/src/main/resources/web/js/ganttz/TaskList.js
index 4fc7061ff..15094b96d 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/TaskList.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/TaskList.js
@@ -24,6 +24,14 @@ ganttz.TaskList = zk.$extends(zk.Widget, {
     legendResize : function() {
         var taskdetailsContainer = jq('.taskdetailsContainer')[0];
         jq('.legend-container').width(taskdetailsContainer.clientWidth-75);
+    },
+    refreshTooltips : function() {
+        if (jq('.show-resources').hasClass('clicked')) {
+            this.showResourceTooltips();
+        }
+        if (jq('.show-labels').hasClass('clicked')) {
+            this.showAllTaskLabels();
+        }
     }
 
 },{//Class stuff