diff --git a/Quake/host.c b/Quake/host.c
index 06d3711a..9a3fff78 100644
--- a/Quake/host.c
+++ b/Quake/host.c
@@ -1464,7 +1464,6 @@ void Host_Init (void)
 
 		V_Init ();
 		Chase_Init ();
-		M_Init (); // woods move this up for tab complete system #iwtabcomplete
 		ExtraMaps_Init (); //johnfitz
 		Modlist_Init (); //johnfitz
 		DemoList_Init (); //ericw
@@ -1484,6 +1483,7 @@ void Host_Init (void)
 		BGM_Init();
 		Sbar_Init ();
 		CL_Init ();
+		M_Init(); // woods move this up for tab complete system #iwtabcomplete
 	}
 
 	LOC_Init (); // for 2021 rerelease support.
diff --git a/Quake/menu.c b/Quake/menu.c
index 9f3dca64..255d5d9b 100644
--- a/Quake/menu.c
+++ b/Quake/menu.c
@@ -3535,6 +3535,7 @@ static struct
 	{"help", M_Menu_Help_f},
 	{"menu_quit", M_Menu_Quit_f},
 	{"menu_credits", M_Menu_Credits_f}, // needed by the 2021 re-release
+	{"namemaker", M_Shortcut_NameMaker_f}, // woods
 };
 
 //=============================================================================
@@ -3668,7 +3669,6 @@ void M_Init (void)
 	Cmd_AddCommand ("togglemenu", M_ToggleMenu_f);
 	Cmd_AddCommand ("menu_cmd", MQC_Command_f);
 	Cmd_AddCommand ("menu_restart", M_MenuRestart_f);	//qss still loads progs on hunk, so we can't do this safely.
-	Cmd_AddCommand ("namemaker", M_Shortcut_NameMaker_f); // woods #namemaker
 
 	if (!MQC_Init())
 		MQC_Shutdown();