diff --git a/src/client/entry.qc b/src/client/entry.qc
index f85307bc..4b0e97c1 100644
--- a/src/client/entry.qc
+++ b/src/client/entry.qc
@@ -838,6 +838,7 @@ CSQC_ConsoleCommand(string sCMD)
 		HUD_SlotSelect(9);
 		break;
 	case "way_menu":
+		Way_Autoload();
 		Textmenu_Call("WAY_MENU");
 		break;
 	case "_fnchat_msg":
diff --git a/src/client/way.qc b/src/client/way.qc
index fb04d7ca..42f04277 100644
--- a/src/client/way.qc
+++ b/src/client/way.qc
@@ -206,6 +206,15 @@ WAY_MENU(int n)
 	}
 }
 
+var int g_waymenu_opened = 0;
+void
+Way_Autoload(void)
+{
+	if (!g_waymenu_opened && autocvar(way_autoload, 1))
+		localcmd(sprintf("sv way load %s.way\n", mapname));
+	g_waymenu_opened = 1;
+}
+
 void
 WAY_FILE(int n)
 {