diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index 91cc07d136..3b2aef6da5 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -220,6 +220,7 @@ namespace BizHawk.Client.EmuHawk
 				Emulator,
 				Game);
 
+			InputBox.AutoCompleteCustomSource.Clear();
 			InputBox.AutoCompleteCustomSource.AddRange(LuaImp.Docs.Where(static f => f.SuggestInREPL)
 				.Select(static f => $"{f.Library}.{f.Name}")
 				.ToArray());
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs
index 230b6ae32a..42506ddaa8 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs
@@ -50,7 +50,7 @@ namespace BizHawk.Client.EmuHawk
 						library: name,
 						libraryDescription: libraryDesc,
 						method,
-						suggestInREPL: false
+						suggestInREPL: instance != null
 					);
 					Docs.Add(libFunc);
 				}