diff --git a/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
index 93bd6ada00..460400fd39 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
@@ -45,7 +45,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				sfd.FileName = "NULL";
+				sfd.FileName = PathManager.FilesystemSafeName(Global.Game);
 				sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null);
 			}
 
@@ -91,7 +91,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				sfd.FileName = "NULL";
+				sfd.FileName = PathManager.FilesystemSafeName(Global.Game);
 				sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.WatchPathFragment, null);
 			}