diff --git a/web/src/main/java/de/hsadmin/web/EntryPoint.java b/web/src/main/java/de/hsadmin/web/EntryPoint.java
index 6771dac..8e6bf0a 100644
--- a/web/src/main/java/de/hsadmin/web/EntryPoint.java
+++ b/web/src/main/java/de/hsadmin/web/EntryPoint.java
@@ -38,6 +38,7 @@ public class EntryPoint extends CustomComponent {
 		tab.addComponent(selectTable);
 		tab.setSizeFull();
 		setCompositionRoot(tab);
+		setSizeFull();
 	}
 
 	public void fillTable() {
diff --git a/web/src/main/java/de/hsadmin/web/EntryPointsSelector.java b/web/src/main/java/de/hsadmin/web/EntryPointsSelector.java
index b5ae0d2..60439de 100644
--- a/web/src/main/java/de/hsadmin/web/EntryPointsSelector.java
+++ b/web/src/main/java/de/hsadmin/web/EntryPointsSelector.java
@@ -42,13 +42,14 @@ public class EntryPointsSelector extends CustomComponent implements ItemClickLis
 	private void createTabs() throws RpcException {
 		final String role = getRole();
 		final AbstractEntryPointsFactory entryPointsFactory = FactoryProducer.getEntryPointsFactory("default");
-		boolean hasFirstTab = false;
+		int tabCount = 0;
 		for(String tabName : entryPointsFactory.getEntryPointNames(role)) {
 			accordion.addTab(new EntryPoint(this, tabName), I18N.getText(tabName));
-			hasFirstTab = true;
+			tabCount++;
 		}
-		if (hasFirstTab) {
-			final Component component = accordion.getTab(0).getComponent();
+		if (tabCount > 0) {
+			accordion.setSelectedTab(tabCount - 1);
+			final Component component = accordion.getTab(tabCount - 1).getComponent();
 			if (component instanceof EntryPoint) {
 				((EntryPoint) component).fillTable();
 			}