diff --git a/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs b/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
index 47473edf5c..a3f1eed73a 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
@@ -147,11 +147,11 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (val.HasValue)
 			{
-				Text = String.Empty;
+				Text = String.Format(_addressFormatStr, val);
 			}
 			else
 			{
-				Text = String.Format(_addressFormatStr, val);
+				Text = String.Empty;
 			}
 		}
 	}