diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
index 9ed5c0ce85..277054280c 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
@@ -76,8 +76,6 @@ namespace BizHawk.Client.EmuHawk
 
 			EmulatorLuaLibrary.FrameAdvanceCallback = Frameadvance;
 			EmulatorLuaLibrary.YieldCallback = EmuYield;
-
-			Docs.Sort();
 		}
 
 		public LuaDocumentation Docs { get; private set; }
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
index 275a32171d..9c29baf924 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
@@ -39,7 +39,10 @@ namespace BizHawk.Client.EmuHawk
 
 		private void LuaFunctionList_Load(object sender, EventArgs e)
 		{
-			FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.ToList();
+			FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs
+				.OrderBy(x => x.Library)
+				.ThenBy(x => x.Name)
+				.ToList();
 			UpdateList();
 			FilterBox.Focus();
 		}