diff --git a/source/net/yacy/http/servlets/ServletResource.java b/source/net/yacy/http/servlets/ServletResource.java
index ea306b8d3..9f9cee865 100644
--- a/source/net/yacy/http/servlets/ServletResource.java
+++ b/source/net/yacy/http/servlets/ServletResource.java
@@ -174,7 +174,7 @@ final class ServletResource {
         final boolean directory = Files.isDirectory(child);
         try {
             final String encoded = new URI(null, null, name, null).toASCIIString();
-            html.append("<li><a href=\"").append(escapeHtml(base)).append(encoded);
+            html.append("<li><a href=\"").append(escapeHtml(base)).append(escapeHtml(encoded));
             if (directory) {
                 html.append('/');
             }
diff --git a/test/java/net/yacy/http/servlets/ServletResourceTest.java b/test/java/net/yacy/http/servlets/ServletResourceTest.java
index bac0cd4ec..221ce5c11 100644
--- a/test/java/net/yacy/http/servlets/ServletResourceTest.java
+++ b/test/java/net/yacy/http/servlets/ServletResourceTest.java
@@ -52,14 +52,14 @@ public class ServletResourceTest {
     @Test
     public void createsEscapedDirectoryListing() throws Exception {
         final Path root = this.temporaryFolder.newFolder("root").toPath();
-        Files.writeString(root.resolve("<entry>.txt"), "content", StandardCharsets.UTF_8);
+        Files.writeString(root.resolve("entry &test.txt"), "content", StandardCharsets.UTF_8);
         Files.createDirectory(root.resolve("child"));
         final ServletResource directory = ServletResource.from(root.toUri().toURL());
 
         final String listing = directory.getListHTML("/files/", true, null);
         assertTrue(listing.contains("href=\"../\""));
-        assertTrue(listing.contains("%3Centry%3E.txt"));
-        assertTrue(listing.contains("&lt;entry&gt;.txt"));
+        assertTrue(listing, listing.contains("href=\"/files/entry%20&amp;test.txt\""));
+        assertTrue(listing, listing.contains(">entry &amp;test.txt</a>"));
         assertTrue(listing.contains("href=\"/files/child/\""));
     }
 }