diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index c30a1e363f..37255d48cc 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -107,7 +107,14 @@ namespace BizHawk.Client.EmuHawk
 				GlobalWin.Sound.StartSound();
 				if (result == DialogResult.Yes)
 				{
-					_watches.Save();
+					if (string.IsNullOrWhiteSpace(_watches.CurrentFileName))
+					{
+						SaveAs();
+					}
+					else
+					{
+						_watches.Save();
+					}
 				}
 				else if (result == DialogResult.No)
 				{