diff --git a/BizHawk.Client.Common/PathManager.cs b/BizHawk.Client.Common/PathManager.cs
index 8d9c1050e6..b47be0e1b0 100644
--- a/BizHawk.Client.Common/PathManager.cs
+++ b/BizHawk.Client.Common/PathManager.cs
@@ -263,7 +263,12 @@ namespace BizHawk.Client.Common
 		public static string SaveStatePrefix(GameInfo game)
 		{
 			var name = FilesystemSafeName(game);
-			
+
+			if (Global.Emulator.SystemId == "NES")
+			{
+				name += "." + Global.Emulator.Attributes().CoreName;
+			}
+
 			if (Global.MovieSession.Movie.IsActive)
 			{
 				name += "." + Path.GetFileNameWithoutExtension(Global.MovieSession.Movie.Filename);