diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ISecondaryEntityListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ISecondaryEntityListingQuery.java
index 67aa00309b005218ddfa7c0322c3e398b0560262..48b4268a5cc714f052e9a53b408ec0a93eeaff66 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ISecondaryEntityListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ISecondaryEntityListingQuery.java
@@ -71,6 +71,14 @@ public interface ISecondaryEntityListingQuery extends TransactionQuery
         { LongSetMapper.class }, fetchSize = FETCH_SIZE)
     public DataIterator<SampleReferenceRecord> getSamples(LongSet sampleIds);
 
+    /**
+     * Returns all children sample ids of the specified samples.
+     */
+    @Select(sql = "SELECT sample_id_child FROM sample_relationships "
+            + "    WHERE sample_id_parent = any(?{1})", parameterBindings =
+        { LongSetMapper.class }, fetchSize = FETCH_SIZE)
+    public DataIterator<Long> getChildrenIds(LongSet parentSampleIds);
+
     //
     // Persons
     //
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java
index a6ea68c05dd8255247bf7b715478cafc8bd08615..0da91ffe55ae42df92033a36fe40f64e84eea5bd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo.common.entity;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongSet;
 
 import java.sql.Connection;
@@ -172,6 +173,23 @@ public class SecondaryEntityDAO
         return result;
     }
 
+    public LongSet getSampleDescendantIdsAndSelf(Long sampleId)
+    {
+        LongSet results = new LongOpenHashSet();
+        LongSet currentLayer = new LongOpenHashSet();
+        currentLayer.add(sampleId);
+        // go layer by layer into children samples
+        LongSet nextLayer;
+        while (currentLayer.isEmpty() == false)
+        {
+            results.addAll(currentLayer);
+            nextLayer = new LongOpenHashSet(query.getChildrenIds(currentLayer));
+            nextLayer.removeAll(results); // don't go twice through the same sample
+            currentLayer = nextLayer;
+        }
+        return results;
+    }
+
     private static Sample createSample(SampleReferenceRecord record,
             DatabaseInstance databaseInstance)
     {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
index 559d06dbb65b63d5bc37ade42ad22ed838ee0283..19c752bbdd48320f933f571b757e3479d8a9f787 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
@@ -151,10 +151,11 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
             return enrichDatasets(query.getDatasetsForSample(sampleId.getId()));
         } else
         {
-            // first get directly connected datasets, then go layer by layer into children datasets
+            // get all descendands of the sample
+            LongSet sampleIds = referencedEntityDAO.getSampleDescendantIdsAndSelf(sampleId.getId());
+            // get directly connected datasets, then go layer by layer into children datasets
             LongSet results = new LongOpenHashSet();
-            LongSet currentLayer =
-                    new LongOpenHashSet(query.getDatasetIdsForSample(sampleId.getId()));
+            LongSet currentLayer = new LongOpenHashSet(query.getDatasetIdsForSamples(sampleIds));
             LongSet nextLayer;
             while (currentLayer.isEmpty() == false)
             {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
index aa67e7e955562bfd1a28ac626209c98050ad1923..62ec5f83ee980e727e7de1abfd56cb541757a907 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
@@ -105,6 +105,13 @@ public interface IDatasetListingQuery extends TransactionQuery, IPropertyListing
     @Select(sql = "select id from data where data.samp_id=?{1}", fetchSize = FETCH_SIZE)
     public DataIterator<Long> getDatasetIdsForSample(long sampleId);
 
+    /**
+     * Returns ids of datasets directly connected to samples with given ids.
+     */
+    @Select(sql = "select id from data where data.samp_id = any(?{1})", parameterBindings =
+        { LongSetMapper.class }, fetchSize = FETCH_SIZE)
+    public DataIterator<Long> getDatasetIdsForSamples(LongSet sampleIds);
+
     @Select(sql = "select * from data_set_relationships where data_id_child = any(?{1})", parameterBindings =
         { LongSetMapper.class }, fetchSize = FETCH_SIZE)
     public DataIterator<DatasetRelationRecord> listParentDataSetIds(LongSet ids);
@@ -112,7 +119,7 @@ public interface IDatasetListingQuery extends TransactionQuery, IPropertyListing
     @Select(sql = "select * from data_set_relationships where data_id_parent = any(?{1})", parameterBindings =
         { LongSetMapper.class }, fetchSize = FETCH_SIZE)
     public DataIterator<DatasetRelationRecord> listChildrenDataSetIds(LongSet ids);
-    
+
     /**
      * Returns all datasets that are children of any specified dataset id.
      */