diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
index 0022d43d079262251c4474e31d883d9e79a2fbe4..4ff16662dec1f6df610d3e766b8d8a75471dcc07 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
@@ -242,7 +242,7 @@ public enum CommonExternalDataColDefKind implements IColumnDefinitionKind<Extern
             @Override
             public String tryGetValue(DataSet dataSet)
             {
-                return dataSet.getLocation();
+                return dataSet.getFullLocation();
             }
         }),
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java
index e121e53b70f161494c6fe5c6af170e000b5388f3..e05211870c1cd5b3c7d122d00b8a7942f0a625bd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java
@@ -142,7 +142,7 @@ public abstract class AbstractExternalDataProvider extends
                 Boolean complete = realDataSet.getComplete();
                 builder.column(IS_COMPLETE).addString(
                         complete == null ? "?" : SimpleYesNoRenderer.render(complete));
-                builder.column(LOCATION).addString(realDataSet.getLocation());
+                builder.column(LOCATION).addString(realDataSet.getFullLocation());
                 builder.column(ARCHIVING_STATUS)
                         .addString(realDataSet.getStatus().getDescription());
                 FileFormatType fileFormatType = realDataSet.getFileFormatType();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java
index ec71fd0100d31e34ecb939fee1cb55fdbb8a2506..adc75f20fccf6818da3cd43df77a765543256131 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java
@@ -74,6 +74,11 @@ public class DataSet extends ExternalData implements IDatasetLocation
         return location;
     }
 
+    public String getFullLocation()
+    {
+        return shareId + "/" + location;
+    }
+
     @Override
     public void setLocation(String location)
     {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java
index 5d565984e369e5ff63e108abee954b8b02fc5239..6cc33fb5e53ace6830dacb4297e4716c6b00a19b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java
@@ -32,8 +32,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ContainerDataSet;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSet;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.PropertiesPanelUtils;
 
@@ -107,8 +107,8 @@ public class DataSetPropertiesPanel extends ContentPanel
         DataSet concreteDataSet = dataset.tryGetAsDataSet();
         if (concreteDataSet != null)
         {
-            properties
-                    .put(messageProvider.getMessage(Dict.LOCATION), concreteDataSet.getLocation());
+            properties.put(messageProvider.getMessage(Dict.LOCATION),
+                    concreteDataSet.getFullLocation());
             if (viewContext.getModel().getApplicationInfo().isArchivingConfigured())
             {
                 properties.put(messageProvider.getMessage(Dict.ARCHIVING_STATUS), concreteDataSet