diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
index 9fa90ed1ca..1908c16cd4 100644
--- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
+++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
@@ -114,7 +114,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (e.KeyData == Keys.Enter)
 			{
-				GlobalWin.Tools.HexEditor.FindNext(GetFindBoxChars(), false);
+				Find_Next_Click(null, null);
+				e.Handled = true;
 			}
 		}
 
@@ -125,6 +126,11 @@ namespace BizHawk.Client.EmuHawk
 				e.Handled = true;
 				Close();
 			}
+			else if (e.KeyData == Keys.Enter)
+			{
+				Find_Next_Click(null, null);
+				e.Handled = true;
+			}
 		}
 	}
 }