diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLDirectoryRenderer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLDirectoryRenderer.java
index f81a9fc3fce8c14ca9184c48389024a05333ffc4..79cdabd80fa058edd3ad7fe041eca3811679c34f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLDirectoryRenderer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLDirectoryRenderer.java
@@ -27,8 +27,8 @@ import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.common.utilities.Template;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
 
 /**
  * An <code>IDirectoryRenderer</code> implementation which renders on HTML pages.
@@ -190,7 +190,7 @@ final class HTMLDirectoryRenderer implements IDirectoryRenderer
     {
         try
         {
-            return URLEncoder.encode(url, "UTF-8");
+            return URLEncoder.encode(url, "UTF-8").replace("%2F", "/");
         } catch (final UnsupportedEncodingException ex)
         {
             throw CheckedExceptionTunnel.wrapIfNecessary(ex);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
index 001be6c0d6633f3f0772da1a951768953d4e5bf5..5e1ef98dbc68d6bee429a94461579c73ff0aeb6c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
@@ -120,7 +120,7 @@ final class SimpleHTMLDirectoryRenderer implements IDirectoryRenderer
     {
         try
         {
-            return URLEncoder.encode(url, "UTF-8");
+            return URLEncoder.encode(url, "UTF-8").replace("%2F", "/");
         } catch (final UnsupportedEncodingException ex)
         {
             throw CheckedExceptionTunnel.wrapIfNecessary(ex);