diff --git a/BizHawk.Client.Common/helpers/StringHelpers.cs b/BizHawk.Client.Common/helpers/StringHelpers.cs
index c3de8909dc..cb2aacc305 100644
--- a/BizHawk.Client.Common/helpers/StringHelpers.cs
+++ b/BizHawk.Client.Common/helpers/StringHelpers.cs
@@ -47,32 +47,5 @@ namespace BizHawk.Client.Common
 			
 			return 8;
 		}
-
-		public static uint MaxHexValueFromMaxDigits(int i)
-		{
-			switch (i)
-			{
-				case 0:
-					return 0;
-				case 1:
-					return 0xF;
-				case 2:
-					return 0xFF;
-				case 3:
-					return 0xFFF;
-				case 4:
-					return 0xFFFF;
-				case 5:
-					return 0xFFFFF;
-				case 6:
-					return 0xFFFFFF;
-				case 7:
-					return 0xFFFFFFF;
-				case 8:
-					return 0xFFFFFFFF;
-			}
-
-			return int.MaxValue;
-		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs b/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
index f55fd4aa6a..39c3b067b8 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
@@ -42,8 +42,8 @@ namespace BizHawk.Client.EmuHawk
 			{
 				return (uint)_maxSize.Value;
 			}
-			
-			return IntHelpers.MaxHexValueFromMaxDigits(MaxLength);
+
+            return (uint)(((long)1 << (4 * MaxLength)) - 1);
 		}
 
 		public override void ResetText()