diff --git a/webui/src/main/java/com/muwire/webui/FilesServlet.java b/webui/src/main/java/com/muwire/webui/FilesServlet.java
index de712f60..d25625b8 100644
--- a/webui/src/main/java/com/muwire/webui/FilesServlet.java
+++ b/webui/src/main/java/com/muwire/webui/FilesServlet.java
@@ -63,6 +63,7 @@ public class FilesServlet extends HttpServlet {
                         resp.sendError(403, "bad path");
                         return;
                     }
+                    element = Util.unescapeHTMLinXML(element);
                     if (current == null) {
                         current = new File(element);
                         continue;
diff --git a/webui/src/main/js/util.js b/webui/src/main/js/util.js
index 90fe0870..5a0edf5d 100644
--- a/webui/src/main/js/util.js
+++ b/webui/src/main/js/util.js
@@ -2,6 +2,10 @@ function parseBoolean(s) {
 	return s == "true"
 }
 
+function rfc3986EncodeURIComponent (str) {  
+    return encodeURIComponent(str).replace(/[!'()*]/g, escape);  
+}
+
 /**
 *
 *  Base64 encode / decode