diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs
index 3b3878d4ae..b39828a793 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs
@@ -28,6 +28,7 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
+			this.components = new System.ComponentModel.Container();
 			this.OK = new System.Windows.Forms.Button();
 			this.FilterBox = new System.Windows.Forms.TextBox();
 			this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
@@ -38,6 +39,9 @@
 			this.LibraryName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.LibraryParameters = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.LibraryDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.CopyMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.CopyMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.CopyMenu.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// OK
@@ -77,14 +81,6 @@
 			this.ToWikiMarkupButton.Text = "Wiki markup to Clipboard";
 			this.ToWikiMarkupButton.UseVisualStyleBackColor = true;
 			this.ToWikiMarkupButton.Click += new System.EventHandler(this.ToWikiMarkupButton_Click);
-			//
-			// CopyMenu
-			//
-			this.CopyMenu = new System.Windows.Forms.ContextMenu(
-				new System.Windows.Forms.MenuItem[] {
-					new System.Windows.Forms.MenuItem("Copy")
-				});
-			this.CopyMenu.MenuItems[0].Click += new System.EventHandler(this.FunctionView_Copy);
 			// 
 			// FunctionView
 			// 
@@ -97,9 +93,10 @@
             this.LibraryName,
             this.LibraryParameters,
             this.LibraryDescription});
+			this.FunctionView.ContextMenuStrip = this.CopyMenu;
 			this.FunctionView.FullRowSelect = true;
 			this.FunctionView.GridLines = true;
-			this.FunctionView.VirtualListSize = 0;
+			this.FunctionView.HideSelection = false;
 			this.FunctionView.Location = new System.Drawing.Point(12, 12);
 			this.FunctionView.Name = "FunctionView";
 			this.FunctionView.Size = new System.Drawing.Size(710, 291);
@@ -109,7 +106,6 @@
 			this.FunctionView.VirtualMode = true;
 			this.FunctionView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.FunctionView_ColumnClick);
 			this.FunctionView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FunctionView_KeyDown);
-			this.FunctionView.ContextMenu = this.CopyMenu;
 			// 
 			// LibraryReturn
 			// 
@@ -136,6 +132,20 @@
 			this.LibraryDescription.Text = "Description";
 			this.LibraryDescription.Width = 296;
 			// 
+			// CopyMenu
+			// 
+			this.CopyMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.CopyMenuItem});
+			this.CopyMenu.Name = "CopyMenu";
+			this.CopyMenu.Size = new System.Drawing.Size(103, 26);
+			// 
+			// CopyMenuItem
+			// 
+			this.CopyMenuItem.Name = "CopyMenuItem";
+			this.CopyMenuItem.Size = new System.Drawing.Size(180, 22);
+			this.CopyMenuItem.Text = "&Copy";
+			this.CopyMenuItem.Click += new System.EventHandler(this.FunctionView_Copy);
+			// 
 			// LuaFunctionsForm
 			// 
 			this.AcceptButton = this.OK;
@@ -152,6 +162,7 @@
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Lua Functions";
 			this.Load += new System.EventHandler(this.LuaFunctionList_Load);
+			this.CopyMenu.ResumeLayout(false);
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
@@ -169,6 +180,7 @@
 		private System.Windows.Forms.TextBox FilterBox;
 		private BizHawk.WinForms.Controls.LocLabelEx label1;
 		private System.Windows.Forms.Button ToWikiMarkupButton;
-		private System.Windows.Forms.ContextMenu CopyMenu;
+		private System.Windows.Forms.ContextMenuStrip CopyMenu;
+		private System.Windows.Forms.ToolStripMenuItem CopyMenuItem;
 	}
 }
\ No newline at end of file
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.resx b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.resx
index 72bd54f82e..5555c6ca07 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.resx
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="directoryEntry1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>
\ No newline at end of file