diff --git a/BizHawk.MultiClient/tools/HexFind.Designer.cs b/BizHawk.MultiClient/tools/HexFind.Designer.cs
index e7ddbc2cfb..534658b1be 100644
--- a/BizHawk.MultiClient/tools/HexFind.Designer.cs
+++ b/BizHawk.MultiClient/tools/HexFind.Designer.cs
@@ -42,6 +42,7 @@
 			this.FindBox.Name = "FindBox";
 			this.FindBox.Size = new System.Drawing.Size(156, 20);
 			this.FindBox.TabIndex = 0;
+			this.FindBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FindBox_KeyDown);
 			this.FindBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.FindBox_KeyPress);
 			// 
 			// Find_Prev
diff --git a/BizHawk.MultiClient/tools/HexFind.cs b/BizHawk.MultiClient/tools/HexFind.cs
index e6ce37c028..3fef7e8339 100644
--- a/BizHawk.MultiClient/tools/HexFind.cs
+++ b/BizHawk.MultiClient/tools/HexFind.cs
@@ -110,5 +110,13 @@ namespace BizHawk.MultiClient
 		{
 			ChangeCasing();
 		}
+
+		private void FindBox_KeyDown(object sender, KeyEventArgs e)
+		{
+			if (e.KeyData == Keys.Enter)
+			{
+				Global.MainForm.HexEditor1.FindNext(GetFindBoxChars());
+			}
+		}
 	}
 }