diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
index 3ecb61b5f0..26fa58b22c 100644
--- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
+++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
@@ -149,6 +149,22 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		public byte[] ConvertTextToBytes(string str)
+		{
+			if (_textTable.Any())
+			{
+				var byteArr = new List<byte>();
+				foreach (var chr in str)
+				{
+					byteArr.Add((byte)_textTable.FirstOrDefault(kvp => kvp.Value == chr).Key);
+				}
+
+				return byteArr.ToArray();
+			}
+
+			return str.Select(Convert.ToByte).ToArray();
+		}
+
 		public void FindNext(string value, bool wrap)
 		{
 			var found = -1;
diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
index eabd3bd048..41c0c5dbed 100644
--- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
+++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
@@ -46,8 +46,11 @@ namespace BizHawk.Client.EmuHawk
 				return FindBox.Text;
 			}
 			
+			
+			var bytes = GlobalWin.Tools.HexEditor.ConvertTextToBytes(FindBox.Text);
+
 			var bytestring = new StringBuilder();
-			foreach (var b in FindBox.Text.Select(Convert.ToByte))
+			foreach (var b in bytes)
 			{
 				bytestring.Append(string.Format("{0:X2}", b));
 			}