diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index bca7a619c..d329f2169 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -1694,7 +1694,10 @@ void Application::runApplication(void)
                               SetASCII("AutoloadModule", start.c_str());
     }
 
-    //app.activateWorkbench(start.c_str());
+    // Call this before showing the main window because otherwise:
+    // 1. it shows a white window for a few seconds which doesn't look nice
+    // 2. the layout of the toolbars is completely broken
+    app.activateWorkbench(start.c_str());
 
     // show the main window
     if (!hidden) {
@@ -1710,8 +1713,6 @@ void Application::runApplication(void)
     SoQt::setFatalErrorHandler( messageHandlerSoQt, 0 );
 #endif
 
-    app.activateWorkbench(start.c_str());
-
 
     Instance->d->startingUp = false;