diff --git a/BizHawk.MultiClient/config/PathManager.cs b/BizHawk.MultiClient/config/PathManager.cs
index 53acb9b16f..7e4e29cea0 100644
--- a/BizHawk.MultiClient/config/PathManager.cs
+++ b/BizHawk.MultiClient/config/PathManager.cs
@@ -300,6 +300,8 @@ namespace BizHawk.MultiClient
 		public static string SaveStatePrefix(GameInfo game)
 		{
 			string name = FilesystemSafeName(game);
+			if (Global.Config.BindSavestatesToMovies)
+				name += "." + Path.GetFileNameWithoutExtension(Global.MovieSession.Movie.Filename);
 			switch (game.System)
 			{
 				case "SMS": return Path.Combine(MakeAbsolutePath(Global.Config.PathSMSSavestates, "SMS"), name);
diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index 82a409c133..39fb88ec29 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -322,6 +322,7 @@ namespace BizHawk.MultiClient
 			for (int x = 0; x < Log.Length(); x++)
 				writer.WriteLine(Log.GetFrame(x));
 			writer.WriteLine("[/Input]");
+			Global.RenderPanel.AddMessage(Log.Length().ToString() + " frames saved");
 		}
 
 		public void LoadLogFromSavestateText(string path)