diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.java
index 96bc214b6e0dd6120fe680c41c2118bac438de4d..ce979971d6740b7950f85877c2f6490bf5692e9e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.java
@@ -65,13 +65,12 @@ public final class BrowserGridPagingToolBar extends PagingToolBar
         // Remove the space before the refresh button and replace it with display text
         Component fillItem = getItem(indexOf(displayText) - 1);
         remove(fillItem);
-        
+
         // Add a separator and some fill space
         nextTableButtonIndex = indexOf(displayText) + 1;
         SeparatorToolItem separator = new SeparatorToolItem();
-        insertTableButton(separator);    
-        insertTableButton(new FillToolItem());
-       
+        insertTableButton(separator);
+
         this.messageProvider = messageProvider;
 
         insertTableButton(createTableOperationsLabel());
@@ -88,6 +87,8 @@ public final class BrowserGridPagingToolBar extends PagingToolBar
         this.exportButton = createExportButton(messageProvider, invoker);
         disableExportButton();
         insertTableButton(exportButton);
+
+        insertTableButton(new FillToolItem());
     }
 
     /** Total number of items on all pages */