diff --git a/BizHawk.MultiClient/tools/RamPoke.cs b/BizHawk.MultiClient/tools/RamPoke.cs
index eb0f2ba209..3aee4f6fe2 100644
--- a/BizHawk.MultiClient/tools/RamPoke.cs
+++ b/BizHawk.MultiClient/tools/RamPoke.cs
@@ -25,13 +25,15 @@ namespace BizHawk.MultiClient
 
 		public void SetWatchObject(Watch w, MemoryDomain d)
 		{
-			watch = w;
+			PopulateMemoryDomainComboBox();
+			watch = new Watch(w);
 			domain = d;
 		}
 
 		private void RamPoke_Load(object sender, EventArgs e)
 		{
-			PopulateMemoryDomainComboBox();
+			if (watch.address == 0)
+				PopulateMemoryDomainComboBox();
 			SetTypeRadio(watch.type);
 			SetSignedRadio(watch.signed);
 			if (watch.signed == asigned.HEX)
diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs
index e149fbd2b1..d0f9fa22cb 100644
--- a/BizHawk.MultiClient/tools/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.cs
@@ -471,10 +471,13 @@ namespace BizHawk.MultiClient
 			RamPoke p = new RamPoke();
 			Global.Sound.StartSound();
 
+			int x = indexes[0];
+			Watch bob = searchList[indexes[0]];
 			if (indexes.Count > 0)
 				p.SetWatchObject(searchList[indexes[0]], Domain);
 			p.location = GetPromptPoint();
 			p.ShowDialog();
+			UpdateValues();
 		}
 
 		private void PoketoolStripButton1_Click(object sender, EventArgs e)
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index d179ee2046..cadd9d5cec 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -927,11 +927,13 @@ namespace BizHawk.MultiClient
 			ListView.SelectedIndexCollection indexes = WatchListView.SelectedIndices;
 			Global.Sound.StopSound();
 			RamPoke p = new RamPoke();
+			Global.Sound.StartSound();
 			if (indexes.Count > 0)
 				p.SetWatchObject(watchList[indexes[0]], Domain);
 			p.location = GetPromptPoint();
 			p.ShowDialog();
-			Global.Sound.StartSound();
+			UpdateValues();
+			
 		}
 
 		private void pokeAddressToolStripMenuItem_Click(object sender, EventArgs e)