diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRegistrationPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRegistrationPanel.java
index ea5130e5d0a44d6c4cc8fb28dd88744d96c8ef63..773944ebefeb3dbf2c279c52750133d03c1090c2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRegistrationPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRegistrationPanel.java
@@ -38,13 +38,19 @@ public class SampleRegistrationPanel extends ContentPanel
 
     private final SampleTypeSelectionWidget sampleTypeSelection;
 
+    public static final String ID = "sample-registration";
+
     public SampleRegistrationPanel(final CommonViewContext viewContext)
     {
         setHeading("Sample registration");
         setHeaderVisible(false);
         setBodyBorder(false);
         setScrollMode(Scroll.AUTO);
-        sampleTypeSelection = new SampleTypeSelectionWidget(viewContext, true);
+        sampleTypeSelection = new SampleTypeSelectionWidget(viewContext, true, ID);
+        final ToolBar toolBar = new ToolBar();
+        toolBar.add(new LabelToolItem("Sample type:"));
+        toolBar.add(new AdapterToolItem(sampleTypeSelection));
+        add(toolBar);
         sampleTypeSelection.addSelectionChangedListener(new SelectionChangedListener<ModelData>()
             {
                 @Override
@@ -54,6 +60,7 @@ public class SampleRegistrationPanel extends ContentPanel
                     if (selectedType != null)
                     {
                         removeAll();
+                        add(toolBar);
                         add(viewContext.getClientPluginFactoryProvider().getClientPluginFactory(
                                 selectedType.getCode()).createViewClientForSampleType(
                                 selectedType.getCode()).createRegistrationClientForSampleType(
@@ -62,10 +69,6 @@ public class SampleRegistrationPanel extends ContentPanel
                     }
                 }
             });
-        final ToolBar toolBar = new ToolBar();
-        toolBar.add(new LabelToolItem("Sample type:"));
-        toolBar.add(new AdapterToolItem(sampleTypeSelection));
-        setTopComponent(toolBar);
     }
 
     @Override