diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchFieldsSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchFieldsSelectionWidget.java
index 73804727c2fb5d2ffc353bcf7c9c3bc864be6dd9..7090573515c75b31ee5abee890a120ceecfc7319 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchFieldsSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchFieldsSelectionWidget.java
@@ -238,10 +238,10 @@ public final class DataSetSearchFieldsSelectionWidget extends
             DataSetSearchField field;
             if (isExperimentProperty)
             {
-                field = DataSetSearchField.createSampleProperty(code);
+                field = DataSetSearchField.createExperimentProperty(code);
             } else
             {
-                field = DataSetSearchField.createExperimentProperty(code);
+                field = DataSetSearchField.createSampleProperty(code);
             }
             DataSetSearchFieldComboModel comboModel =
                     createPropertyComboModel(st, field, isLabelDuplicated(st, types));