diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
index 8e191fc2fd9990618f2c81b78f15b220a10f071c..c6b2e1aab93625051ce97290055d8bf45f0144dd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
@@ -94,6 +94,9 @@ public class DataSetUtils
             result = StringUtils.escape(result, REGEXP_METACHARACTERS_TO_ESCAPE);
             result = result.replace("*", ".*");
             result = result.replace("?", ".");
+        } else
+        {
+            result = result.substring(REGEXP_PREFIX.length());
         }
         return result;
     }
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/DataSetUtilsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/DataSetUtilsTest.java
index 071652c3ac24bb4d3bd037298d39e8202661a1d3..5012d29b9335579dbb31499f8d0a069aa9c2c2be 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/DataSetUtilsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/DataSetUtilsTest.java
@@ -33,14 +33,15 @@ public class DataSetUtilsTest extends AssertJUnit
     {
         return new Object[][]
             {
-                        { DataSetUtils.REGEXP_PREFIX + "file_.+\\.*",
-                                DataSetUtils.REGEXP_PREFIX + "file_.+\\.*" },
-                        { "file$^.|(1){2}<3>+", "file\\$\\^\\.\\|\\(1\\)\\{2\\}\\<3\\>\\+" },
-                        { "dir\\file", "dir\\\\file" },
-                        { "file.*", "file\\..*" },
-                        { "file.?", "file\\.." },
-                        { "*.tsv", ".*\\.tsv" },
-                        { "file[0-9].txt", "file[0-9]\\.txt" },
+                { DataSetUtils.REGEXP_PREFIX + "file_.+\\.*", "file_.+\\.*" },
+                { "file$^.|(1){2}<3>+", "file\\$\\^\\.\\|\\(1\\)\\{2\\}\\<3\\>\\+" },
+                { "dir\\file", "dir\\\\file" },
+                { "file.*", "file\\..*" },
+                { "file.?", "file\\.." },
+                { "*.tsv", ".*\\.tsv" },
+                { "file[0-9].txt", "file[0-9]\\.txt" },
+                { "*.", ".*\\." },
+                { ".*", "\\..*" }
 
             };
     }