diff --git a/port/src/mpsetups.c b/port/src/mpsetups.c
index 2c308fb9c..4fb6dfe97 100644
--- a/port/src/mpsetups.c
+++ b/port/src/mpsetups.c
@@ -809,7 +809,7 @@ static MenuItemHandlerResult menuhandlerSetupSetDefault(s32 operation, struct me
 		s32 selected = g_Menus[g_MpPlayerNum].mpsetup.slotindex;
 		// clicked on "clear default"
 		if (selected == g_MpSetupFile.defaultsetup - 1) {
-			g_MpSetupFile.defaultsetup = -1;
+			g_MpSetupFile.defaultsetup = 0;
 			strcpy(g_LabelSetDefault, "Set Default\n");
 		} else {
 			g_MpSetupFile.defaultsetup = selected + 1;
diff --git a/src/game/filemgr.c b/src/game/filemgr.c
index 45b85efae..3bd98b5b5 100644
--- a/src/game/filemgr.c
+++ b/src/game/filemgr.c
@@ -19,6 +19,7 @@
 #include "lib/str.h"
 #include "data.h"
 #include "types.h"
+#include "mpsetups.h"
 
 // bss
 struct fileguid g_FilemgrFileToCopy;
@@ -2732,6 +2733,10 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me
 				g_GameFileGuid.fileid = file->fileid;
 				g_GameFileGuid.deviceserial = file->deviceserial;
 				filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_LOAD_GAME, 0);
+
+                // load the setup file when entering the Combat Simulator
+                mpsetupCopyAllFromPak();
+                mpsetupLoadCurrentFile();
 			}
 		}
 		break;
diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c
index 8e7eefe61..1a442c8de 100644
--- a/src/game/mplayer/setup.c
+++ b/src/game/mplayer/setup.c
@@ -5394,10 +5394,6 @@ MenuDialogHandlerResult menudialogCombatSimulator(s32 operation, struct menudial
 		g_Vars.waitingtojoin[1] = false;
 		g_Vars.waitingtojoin[2] = false;
 		g_Vars.waitingtojoin[3] = false;
-
-		// load the setup file when entering the Combat Simulator
-		mpsetupCopyAllFromPak();
-		mpsetupLoadCurrentFile();
 	}
 
 	if (g_Menus[g_MpPlayerNum].curdialog
diff --git a/src/include/types.h b/src/include/types.h
index 5f8791717..8ed1a2725 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -3776,8 +3776,10 @@ struct menudata_main {
 struct menudata_mpsetup {
 	u32 slotindex;
 	u32 slotcount;
-	u8 showpresets;
 	u32 unke24;
+	u32 unke28;
+	u32 unke2c;
+    u8 showpresets;
 };
 
 struct menudata_mppause {
@@ -3990,9 +3992,9 @@ struct menu {
 		struct menudata_filemgr fm;
 		struct menudata_main4mb main4mb;
 		struct menudata_training training;
+        struct menudata_mpsetup mpsetup;
 	};
 
-	struct menudata_mpsetup mpsetup;
 };
 
 struct gamefile {