diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TabSwitcher.java b/ganttzk/src/main/java/org/zkoss/ganttz/TabSwitcher.java
index 0a94e18b8..e727a9cc4 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TabSwitcher.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TabSwitcher.java
@@ -47,16 +47,15 @@ public class TabSwitcher extends HtmlMacroComponent {
 
     private void addTabsFromComfiguration(TabsConfiguration configuration) {
         container.getChildren().clear();
-        tabsRegistry = new TabsRegistry(container);
         IMenuItemsRegister menu = getMenuItemsRegisterLocator().retrieve();
         configuration.applyTo(tabsRegistry, menu);
-        tabsRegistry.showFirst();
     }
 
     @Override
     public void afterCompose() {
         super.afterCompose();
         container = getFellow("container");
+        tabsRegistry = new TabsRegistry(container);
         if (configuration != null) {
             addTabsFromComfiguration(configuration);
         }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
index 4904e18c5..ce11d1546 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
@@ -208,7 +208,9 @@ public class MultipleTabsPlannerController implements Composer,
         tabsSwitcher.setConfiguration(buildTabsConfiguration());
         final URLHandler<IGlobalViewEntryPoints> handler = registry
                 .getRedirectorFor(IGlobalViewEntryPoints.class);
-        handler.applyIfMatches(this);
+        if (!handler.applyIfMatches(this)) {
+            goToCompanyScheduling();
+        }
         handler.registerListener(this, comp.getPage());
     }