diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 95c5bea682743f786e337c0a091ccbc0019acb74..cda31bdf6d23ca87a09adcaa3cf2bc03b4a99505 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -484,7 +484,7 @@ public class IndexBean {
     public String getTunnelName(int tunnel) {
         TunnelController tun = getController(tunnel);
         if (tun != null && tun.getName() != null)
-            return tun.getName();
+            return DataHelper.escapeHTML(tun.getName());
         else
             return _("New Tunnel");
     }
@@ -590,7 +590,7 @@ public class IndexBean {
     public String getTunnelDescription(int tunnel) {
         TunnelController tun = getController(tunnel);
         if (tun != null && tun.getDescription() != null)
-            return tun.getDescription();
+            return DataHelper.escapeHTML(tun.getDescription());
         else
             return "";
     }