diff --git a/plugins/c9.ide.behaviors/tabs.js b/plugins/c9.ide.behaviors/tabs.js
index 474e5025..9299c88e 100644
--- a/plugins/c9.ide.behaviors/tabs.js
+++ b/plugins/c9.ide.behaviors/tabs.js
@@ -256,12 +256,14 @@ define(function(require, exports, module) {
             
             menus.addItemByPath("Window/Tabs/~", new apf.label({
                 class: "splits",
-                caption: "<span class='nosplit'></span>"
-                    + "<span class='twovsplit'></span>"
-                    + "<span class='twohsplit'></span>"
-                    + "<span class='foursplit'></span>"
-                    + "<span class='threeleft'></span>"
-                    + "<span class='threeright'></span>",
+                caption: [
+                    ["span", { class: "nosplit" }],
+                    ["span", { class: "twovsplit" }],
+                    ["span", { class: "twohsplit" }],
+                    ["span", { class: "foursplit" }],
+                    ["span", { class: "threeleft" }],
+                    ["span", { class: "threeright" }],
+                ],
                 onclick: function(e) {
                     var span = e.htmlEvent.target;
                     if (!span || span.tagName != "SPAN") return;
diff --git a/plugins/c9.ide.ui/lib_apf.js b/plugins/c9.ide.ui/lib_apf.js
index 7ce68c9a..896593e7 100644
--- a/plugins/c9.ide.ui/lib_apf.js
+++ b/plugins/c9.ide.ui/lib_apf.js
@@ -13796,7 +13796,12 @@ apf.label = function(struct, tagName) {
      */
     this.$supportedProperties.push("caption", "for", "textalign");
     this.$propHandlers["caption"] = function(value) {
-        this.$caption.textContent = value;
+        if (typeof value == "string")
+            this.$caption.textContent = value;
+        else if (Array.isArray(value)) {
+            this.$caption.textContent = "";
+            apf.buildDom(value, this.$caption);
+        }
     };
     this.$propHandlers["for"] = function(value) {
         forElement = typeof value == "string" ? self[value] : value;