diff --git a/BizHawk.MultiClient/GBtools/GBGameGenie.cs b/BizHawk.MultiClient/GBtools/GBGameGenie.cs
index b91d538723..6a4aa1640d 100644
--- a/BizHawk.MultiClient/GBtools/GBGameGenie.cs
+++ b/BizHawk.MultiClient/GBtools/GBGameGenie.cs
@@ -367,7 +367,7 @@ namespace BizHawk.MultiClient
 			if (String.IsNullOrWhiteSpace(ValueBox.Text))
 				c.value = 0;
 			else
-				c.value = (byte)((int.Parse(ValueBox.Text, NumberStyles.HexNumber) & 0xFF00) >> 8);
+				c.value = (byte)(int.Parse(ValueBox.Text, NumberStyles.HexNumber));
 
 			if (!String.IsNullOrWhiteSpace(CompareBox.Text))
 			{
diff --git a/BizHawk.MultiClient/SNESTools/SNESGameGenie.cs b/BizHawk.MultiClient/SNESTools/SNESGameGenie.cs
index 43c4d0fa53..ca62d6fb2f 100644
--- a/BizHawk.MultiClient/SNESTools/SNESGameGenie.cs
+++ b/BizHawk.MultiClient/SNESTools/SNESGameGenie.cs
@@ -305,12 +305,14 @@ namespace BizHawk.MultiClient
 			if (String.IsNullOrWhiteSpace(AddressBox.Text))
 				c.address = 0;
 			else
+			{
 				c.address = int.Parse(AddressBox.Text, NumberStyles.HexNumber);
-
+				c.address += 0x8000;
+			}
 			if (String.IsNullOrWhiteSpace(ValueBox.Text))
 				c.value = 0;
 			else
-				c.value = (byte)((int.Parse(ValueBox.Text, NumberStyles.HexNumber) & 0xFF00) >> 8);
+				c.value = (byte)(int.Parse(ValueBox.Text, NumberStyles.HexNumber));
 
 			c.compare = null;
 			for (int x = 0; x < Global.Emulator.MemoryDomains.Count; x++)