diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs
index 90bb83eff4..79f0d4e8de 100644
--- a/BizHawk.MultiClient/tools/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.cs
@@ -44,7 +44,7 @@ namespace BizHawk.MultiClient
 		int defaultPrevWidth;
 		int defaultChangesWidth;
 		string currentSearchFile = "";
-
+		string addressFormatStr = "{0:X4}  ";
 		bool sortReverse;
 		string sortedCol;
 
@@ -184,6 +184,7 @@ namespace BizHawk.MultiClient
 			}
 			SetPlatformAndMemoryDomainLabel();
 			StartNewSearch();
+			addressFormatStr = "X" + GetNumDigits(Domain.Size - 1).ToString();
 		}
 
 		private void SetTotal()
@@ -563,7 +564,7 @@ namespace BizHawk.MultiClient
 			text = "";
 			if (column == 0)
 			{
-				text = searchList[index].address.ToString("X" + GetNumDigits(Domain.Size - 1).ToString());
+				text = searchList[index].address.ToString(addressFormatStr);
 			}
 			if (column == 1)
 			{
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index b457e4cb41..06cf649318 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -34,6 +34,7 @@ namespace BizHawk.MultiClient
 		string currentWatchFile = "";
 		bool changes = false;
 		List<ToolStripMenuItem> domainMenuItems = new List<ToolStripMenuItem>();
+		string addressFormatStr = "{0:X4}  ";
 
 		string sortedCol;
 		bool sortReverse;
@@ -168,7 +169,7 @@ namespace BizHawk.MultiClient
 				if (watchList[index].type == atype.SEPARATOR)
 					text = "";
 				else
-					text = String.Format("{0:X" + GetNumDigits((Domain.Size - 1)).ToString() + "}", watchList[index].address);
+					text = watchList[index].address.ToString(addressFormatStr);
 			}
 			if (column == 1) //Value
 			{
@@ -1321,6 +1322,7 @@ namespace BizHawk.MultiClient
 			{
 				Domain = Global.Emulator.MemoryDomains[pos];
 			}
+			addressFormatStr = "X" + GetNumDigits(Domain.Size - 1).ToString();
 			SetPlatformAndMemoryDomainLabel();
 			Update();
 		}