diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptExecutionFramework.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptExecutionFramework.java
index 539c8f52b52b71fd5bc6da66258cf3e8a4e7feae..69a3b1331c9d877040dbb0555384978143bc2105 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptExecutionFramework.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptExecutionFramework.java
@@ -308,23 +308,12 @@ public class ScriptExecutionFramework
 
     private void evaluate()
     {
-        if (StringUtils.isBlank(sampleChooser.getValue()) == false)
-        {
-            evaluate(EntityKind.SAMPLE, sampleChooser.getValue(), state.getScript());
-        }
-        if (experimentChooser.tryToGetValue() != null
-                && StringUtils.isBlank(experimentChooser.tryToGetValue().getIdentifier()) == false)
-        {
-            evaluate(EntityKind.EXPERIMENT, experimentChooser.tryToGetValue().getIdentifier(),
-                    state.getScript());
-        }
-        if (StringUtils.isBlank(materialChooser.getValue()) == false)
-        {
-            evaluate(EntityKind.MATERIAL, materialChooser.getValue(), state.getScript());
-        }
-        if (StringUtils.isBlank(datasetChooser.getValue()) == false)
+
+        BasicEntityDescription selectedEntityOrNull = tryGetSelectedEntity();
+        if (selectedEntityOrNull != null)
         {
-            evaluate(EntityKind.DATA_SET, datasetChooser.getValue(), state.getScript());
+            evaluate(selectedEntityOrNull.getEntityKind(),
+                    selectedEntityOrNull.getEntityIdentifier(), state.getScript());
         }
     }