diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
index a72a795df0f82b2cdcc8d4bd3ff93250bf14e4de..978b1fc4685ba1e606beea6fa3bf1d29acdfb093 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
@@ -491,7 +491,9 @@ abstract public class GenericSampleViewer extends AbstractViewerWithVerticalSpli
             return new DatabaseModificationKind[]
                 {
                         DatabaseModificationKind.createOrDelete(ObjectKind.SAMPLE),
+                        DatabaseModificationKind.createOrDelete(ObjectKind.SAMPLE_TYPE),
                         DatabaseModificationKind.edit(ObjectKind.SAMPLE),
+                        DatabaseModificationKind.edit(ObjectKind.SAMPLE_TYPE),
                         DatabaseModificationKind.createOrDelete(ObjectKind.EXPERIMENT),
                         DatabaseModificationKind.edit(ObjectKind.EXPERIMENT),
                         DatabaseModificationKind
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilder.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilder.java
index c73c098f5c5973c365c1d86b546eba7369759893..d99f984ba00149ff0f22e81d639eb91489fff9cb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilder.java
@@ -17,6 +17,7 @@
 package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -109,6 +110,7 @@ class ParentsPropertiesSectionBuilder
                 sections.put("Common Parent Properties:", commonProperties);
             }
         }
+        Collections.sort(samples);
         for (Sample sample : samples)
         {
             List<IEntityProperty> properties = sample.getProperties();