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 32cbc067a30a8b08adad8ebe58e8c396d06a496b..de04a92f5ea5f9a29ae59cf37d524369e9257b39 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
@@ -455,7 +455,10 @@ public final class GenericSampleViewer extends AbstractViewer<IGenericClientServ
         {
             return new DatabaseModificationKind[]
                 {
+                        DatabaseModificationKind.createOrDelete(ObjectKind.SAMPLE),
                         DatabaseModificationKind.edit(ObjectKind.SAMPLE),
+                        DatabaseModificationKind.createOrDelete(ObjectKind.EXPERIMENT),
+                        DatabaseModificationKind.edit(ObjectKind.EXPERIMENT),
                         DatabaseModificationKind
                                 .createOrDelete(ObjectKind.PROPERTY_TYPE_ASSIGNMENT),
                         DatabaseModificationKind.edit(ObjectKind.PROPERTY_TYPE_ASSIGNMENT),