diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
index 5d689464e9288bdbc57f96023a6c2e528002ceb3..3c0fb430516725866d427a7569458e567fb2807b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
@@ -30,7 +30,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
 @Controller
 @RequestMapping(
     { "/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH,
-            "/openbis/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH })
+            "/openbis/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH,
+            "/openbis/openbis/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH })
 public class DataSetUploadClientServingServlet extends AbstractWebStartClientServingServlet
 {
     private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
index 29a8440f454d03996d1792eb5c057d6205a6053a..416b3e5da40ca45a0fd3880d2b5fada8c007a076 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
@@ -73,7 +73,7 @@ public class DataSetMenu extends TopMenuItem
                 public void componentSelected(MenuEvent ce)
                 {
                     final URLMethodWithParameters urlParams =
-                            new URLMethodWithParameters("/openbis/"
+                            new URLMethodWithParameters("/openbis/openbis/"
                                     + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH);
                     String sessionToken = viewContext.getModel().getSessionContext().getSessionID();
                     urlParams.addParameter("session", sessionToken);