diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index 23ff22a3ca..35b677a462 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -503,7 +503,9 @@ def postStart():
     # switch workbench
     wb = param.GetString("AutoloadModule","")
     if wb:
-        FreeCADGui.activateWorkbench(wb)
+        # don't switch workbenches if we are not in Start anymore
+        if FreeCADGui.activeWorkbench() and (FreeCADGui.activeWorkbench().name() == "StartWorkbench"):
+            FreeCADGui.activateWorkbench(wb)
 
     # close start tab
     cl = param.GetBool("closeStart",False)