diff --git a/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
index 185b9fe5ee..b2691325bc 100644
--- a/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
+++ b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
@@ -409,7 +409,6 @@ namespace BizHawk.Client.EmuHawk
 		public void ClearGUIText()
 		{
 			GlobalWin.DisplayManager.NeedsToPaint = true;
-
 			GUITextList.Clear();
 		}
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 9a001dec63..483968e4bd 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2618,6 +2618,9 @@ namespace BizHawk.Client.EmuHawk
 				bool updateFpsString = (runloop_last_ff != ff);
 				runloop_last_ff = ff;
 
+				//client input-related duties
+				GlobalWin.OSD.ClearGUIText();
+
 				if (!fff)
 				{
 					UpdateToolsBefore();
@@ -2626,8 +2629,6 @@ namespace BizHawk.Client.EmuHawk
 				Global.ClickyVirtualPadController.FrameTick();
 
 				runloop_fps++;
-				//client input-related duties
-				GlobalWin.OSD.ClearGUIText();
 
 				if ((DateTime.Now - runloop_second).TotalSeconds > 1)
 				{
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index ec1724f2bc..11e038df5c 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -228,6 +228,7 @@ namespace BizHawk.Client.EmuHawk
 				Changes();
 				UpdateWatchCount();
 				WatchListView.ItemCount = Watches.ItemCount;
+				UpdateValues();
 			}
 		}