diff --git a/src/client/component/game_console.cpp b/src/client/component/game_console.cpp
index 8fb8aa3e..19f20327 100644
--- a/src/client/component/game_console.cpp
+++ b/src/client/component/game_console.cpp
@@ -318,6 +318,8 @@ namespace game_console
 			}
 			else if (matches.size() > 1)
 			{
+				std::sort(matches.begin(), matches.end()); // alphabetize sort
+
 				draw_hint_box(static_cast<int>(matches.size()), dvars::con_inputHintBoxColor->current.vector);
 
 				const auto offset_value = floor((con.screen_max[0] - con.globals.x) / 4.f);
diff --git a/src/client/component/patches.cpp b/src/client/component/patches.cpp
index 975b83b3..ee013b27 100644
--- a/src/client/component/patches.cpp
+++ b/src/client/component/patches.cpp
@@ -80,21 +80,40 @@ namespace patches
 			return game::Dvar_FindVar("name")->current.string;
 		}
 
-		void dvar_write_single_variable_stub(const game::dvar_t* dvar, int* user_data)
+		std::vector<std::string> dvar_save_variables;
+		void dvar_write_single_variable(const game::dvar_t* dvar, int* user_data)
 		{
 			if ((dvar->flags & game::DVAR_FLAG_SAVED) != 0)
 			{
 				const char* val = game::Dvar_DisplayableLatchedValue(dvar);
 				auto h = *user_data;
-				auto dvar_name = dvars::dvar_get_name(dvar);
-				if (!dvar_name.empty())
-				{
-					game::FS_Printf(h, "seta %s \"%s\"\n", dvar_name.data(), val);
-				}
-				else
+
+				std::string dvar_name = dvars::dvar_get_name(dvar);
+				if (dvar_name.empty())
 				{
 					game::FS_Printf(h, "setcl %d \"%s\"\n", dvar->checksum, val);
 				}
+				else
+				{
+					dvar_save_variables.push_back(dvar_name);
+				}
+			}
+		}
+
+		void dvar_write_variables_stub(int handle)
+		{
+			dvar_save_variables.clear();
+
+			int* user_data = &handle;
+			game::Dvar_ForEach(dvar_write_single_variable, user_data);
+
+			std::sort(dvar_save_variables.begin(), dvar_save_variables.end()); // alphabetize sort
+			for (size_t i = 0; i < dvar_save_variables.size(); i++)
+			{
+				const auto* dvar_name = dvar_save_variables.at(i).data();
+				const auto* dvar = game::Dvar_FindVar(dvar_name);
+				const char* val = game::Dvar_DisplayableLatchedValue(dvar);
+				game::FS_Printf(handle, "seta %s \"%s\"\n", dvar_name, val);
 			}
 		}
 
@@ -191,7 +210,7 @@ namespace patches
 			utils::hook::jump(0xD32770_b, live_get_local_client_name);
 
 			// write better config
-			utils::hook::jump(0xBB2A50_b, dvar_write_single_variable_stub);
+			utils::hook::jump(0xBB2A90_b, dvar_write_variables_stub);
 
 			// show missing fastfiles
 			utils::hook::call(0x3BBD4B_b, missing_content_error_stub);
diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp
index 778424f7..3fad3239 100644
--- a/src/client/game/symbols.hpp
+++ b/src/client/game/symbols.hpp
@@ -80,6 +80,7 @@ namespace game
 
 	WEAK symbol<void(const char* name, const char* string)> Dvar_SetCommand{ 0xCECB30 };
 	WEAK symbol<dvar_t* (const char* name)> Dvar_FindVar{ 0xCEA460 };
+	WEAK symbol<void(void* callback, void* userData)> Dvar_ForEach{ 0xCEA480 };
 	WEAK symbol<dvar_t* (unsigned int checksum)> Dvar_FindMalleableVar{ 0xCEA3C0 };
 	WEAK symbol<void(const dvar_t* dvar)> Dvar_ClearModified{ 0xCE9E90 };
 	WEAK symbol<const char* (const dvar_t* dvar)> Dvar_DisplayableLatchedValue{ 0xCEA1D0 };