diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp
index 1d2296650..ee849986e 100644
--- a/source/duke3d/src/game.cpp
+++ b/source/duke3d/src/game.cpp
@@ -6464,9 +6464,11 @@ int app_main(int argc, char const * const * argv)
     else
         Bsprintf(tempbuf, "%s_settings.cfg", p);
 
-    OSD_Exec(tempbuf);
     Bfree(setupFileName);
 
+    OSD_Exec(tempbuf);
+    OSD_Exec("autoexec.cfg");
+
     if (g_networkMode != NET_DEDICATED_SERVER)
     {
         if (setgamemode(ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP) < 0)
@@ -6509,12 +6511,8 @@ int app_main(int argc, char const * const * argv)
 
         S_MusicStartup();
         S_SoundStartup();
+        Menu_Init();
     }
-//    loadtmb();
-
-    OSD_Exec("autoexec.cfg");
-
-    Menu_Init();
 
     if (ud.warp_on > 1 && (!g_netServer && ud.multimode < 2))
     {