diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index fc70a91f8a..a34e4f488a 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -736,11 +736,13 @@ namespace BizHawk.Client.EmuHawk
 			return true;
 		}
 
-		private static void UpdateRegisteredFunctionsDialog()
+		private void UpdateRegisteredFunctionsDialog()
 		{
+			if (LuaImp is null) return;
+
 			foreach (var form in Application.OpenForms.OfType<LuaRegisteredFunctionsList>().ToList())
 			{
-				form.UpdateValues();
+				form.UpdateValues(LuaImp.RegisteredFunctions);
 			}
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
index dc4ce4e96f..844c5fb4d1 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
@@ -10,7 +10,7 @@ namespace BizHawk.Client.EmuHawk
 	{
 		private readonly IMainFormForApi _mainForm;
 
-		private readonly LuaFunctionList _registeredFunctions;
+		private LuaFunctionList _registeredFunctions;
 
 		public LuaRegisteredFunctionsList(IMainFormForApi mainForm, LuaFunctionList registeredFunctions)
 		{
@@ -22,8 +22,9 @@ namespace BizHawk.Client.EmuHawk
 
 		public Point StartLocation { get; set; } = new Point(0, 0);
 
-		public void UpdateValues()
+		public void UpdateValues(LuaFunctionList registeredFunctions)
 		{
+			_registeredFunctions = registeredFunctions;
 			PopulateListView();
 		}