diff --git a/source/Ox.UI/js/List/TreeList.js b/source/Ox.UI/js/List/TreeList.js
index bd16c6e2..ec80ec32 100644
--- a/source/Ox.UI/js/List/TreeList.js
+++ b/source/Ox.UI/js/List/TreeList.js
@@ -186,7 +186,7 @@ Ox.TreeList = function(options, self) {
     function parseData(key, value) {
         var ret = {
                 id: Ox.uid().toString(),
-                title: key.toString() + ': '
+                title: Ox.encodeHTMLEntities(key.toString()) + ': '
             },
             type = Ox.typeOf(value);
         if (type == 'array' || type == 'object') {
@@ -202,8 +202,8 @@ Ox.TreeList = function(options, self) {
             ret.title += (
                 type == 'function'
                 ? value.toString().split('{')[0]
-                : JSON.stringify(value)
-                    .replace(/(^"|"$)/g, '<span class="OxLight">"</span>')
+                : Ox.encodeHTMLEntities(JSON.stringify(value))
+                    .replace(/(^&quot;|&quot;$)/g, '<span class="OxLight">"</span>')
             );
         }
         return ret;