diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java
index c22229b22775bdcfc9c770d30044600b243c540e..390110013abcb70b23849a03a4e421bec0bf058c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java
@@ -26,7 +26,6 @@ import com.extjs.gxt.ui.client.event.SelectionChangedEvent;
 import com.extjs.gxt.ui.client.event.SelectionChangedListener;
 import com.extjs.gxt.ui.client.store.ListStore;
 import com.extjs.gxt.ui.client.util.Util;
-import com.extjs.gxt.ui.client.widget.toolbar.LabelToolItem;
 import com.google.gwt.user.client.ui.Frame;
 import com.google.gwt.user.client.ui.Widget;
 
@@ -103,7 +102,6 @@ public class DataViewSection extends TabContent
         final DatastoreServiceSelectionWidget serviceSelectionWidget =
                 new DatastoreServiceSelectionWidget(viewContext, dataset, hideFileView,
                         hideSmartView);
-        getHeader().addTool(new LabelToolItem(serviceSelectionWidget.getFieldLabel() + ": "));
         getHeader().addTool(serviceSelectionWidget);
         serviceSelectionWidget.addSelectionChangedListener(createServiceSelectionChangedListener());
     }
@@ -259,6 +257,13 @@ public class DataViewSection extends TabContent
                             }
                         }
                         setSelection(Arrays.asList(defaultModel));
+                        if (modelsStore.getCount() < 2)
+                        {
+                            hide();
+                        } else
+                        {
+                            show();
+                        }
                     }
                 };
         }
diff --git a/screening/etc/web-client.properties b/screening/etc/web-client.properties
index 68a1de8c85fbb1920f619d95bb1dae9e067d4789..33c05c4e22cd4c72e345102962f54119fe50b0d6 100644
--- a/screening/etc/web-client.properties
+++ b/screening/etc/web-client.properties
@@ -37,6 +37,6 @@ experiment-view.hide-sections = attachment-section
 
 data-view.view = generic_dataset_viewer
 data-view.types = HCS_IMAGE
-data-view.hide-smart-view = true
-data-view.hide-file-view = true
+data-view.hide-smart-view = false
+data-view.hide-file-view = false