diff --git a/src/base/single/label/abstract.label.js b/src/base/single/label/abstract.label.js
index a3954e094..b51ee8d80 100644
--- a/src/base/single/label/abstract.label.js
+++ b/src/base/single/label/abstract.label.js
@@ -18,7 +18,8 @@ BI.AbstractLabel = BI.inherit(BI.Single, {
             tgap: 0,
             bgap: 0,
             text: "",
-            highLight: false
+            highLight: false,
+            handler: null
         });
     },
 
@@ -33,7 +34,8 @@ BI.AbstractLabel = BI.inherit(BI.Single, {
             value: o.value,
             py: o.py,
             keyword: o.keyword,
-            highLight: o.highLight
+            highLight: o.highLight,
+            handler: o.handler
         };
     },
 
@@ -368,4 +370,4 @@ BI.AbstractLabel = BI.inherit(BI.Single, {
     populate: function () {
         BI.AbstractLabel.superclass.populate.apply(this, arguments);
     }
-});
\ No newline at end of file
+});
diff --git a/src/base/single/text.js b/src/base/single/text.js
index c3457e85a..79d10a2fc 100644
--- a/src/base/single/text.js
+++ b/src/base/single/text.js
@@ -59,7 +59,7 @@ BI.Text = BI.inherit(BI.Single, {
             textOverflow: o.whiteSpace === "nowrap" ? "ellipsis" : "",
             overflow: o.whiteSpace === "nowrap" ? "" : (BI.isWidthOrHeight(o.height) ? "auto" : "")
         });
-        if (o.handler) {
+        if (o.handler && o.handler !== BI.emptyFn) {
             this.text = BI.createWidget({
                 type: "bi.layout",
                 tagName: "span"