diff --git a/UI/WebServerResources/dtree.js b/UI/WebServerResources/dtree.js
index b2c3143b2..56ce5c194 100644
--- a/UI/WebServerResources/dtree.js
+++ b/UI/WebServerResources/dtree.js
@@ -13,10 +13,14 @@
    equivalent entities. */
 function dTreeQuote(str) {
     return (str
+            .replace(/&/g, "&")
+            .replace(/</g, "&lt;")
             .replace(/\"/g, "&quot;")
             .replace(/\'/g, "&apos;"));
 }
 
+window.alert("test: " + dTreeQuote("& < \" ' \" &"));
+
 // Node object
 function Node(id, pid, name, isParent, url, dataname, datatype, title, target,
               icon, iconOpen, open, hasUnseen) {