diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java
index 56dab4edd42e81660f9678c82aa315f913d36601..979f7a69459b87a021c63dc93b2e11e2a91034b6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java
@@ -153,7 +153,7 @@ abstract public class DropDownList<M extends ModelData, E> extends ComboBox<M> i
                     String v = comboBox.getRawValue();
                     // WORKAROUND: (GXT2.1) only one option in the list when something
                     // selected and trigger field clicked
-                    if (StringUtils.isBlank(v))
+                    if (StringUtils.isBlank(v) || comboBox.isExpanded() == false)
                     {
                         return true;
                     }
@@ -167,7 +167,6 @@ abstract public class DropDownList<M extends ModelData, E> extends ComboBox<M> i
                     }
                     return false;
                 }
-
             };
         ListStore<M> newStore = new ListStore<M>()
             {