diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index c2994d8a32..eb481d098d 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1093,9 +1093,15 @@ namespace BizHawk.MultiClient
 			Global.Emulator.SaveStateText(writer);
             //TODO: logic surrounding the behavior of movie modes & settings
             //TODO: refactor save/loadstate as functions to automatically include this behavior too
-            InputLog.DumpLogIntoSavestateText(writer);
+            if (UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE)
+            {
+                UserMovie.DumpLogIntoSavestateText(writer);
+            }
+            else if (InputLog.GetMovieMode() != MOVIEMODE.INACTIVE)
+                InputLog.DumpLogIntoSavestateText(writer);
 			writer.Close();
 			Global.RenderPanel.AddMessage("Saved state: " + name);
+            Global.RenderPanel.AddMessage("Saved state: " + name);
 		}
 
         private void SaveStateAs()
diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs
index 2429d747eb..e64d297e1c 100644
--- a/BizHawk.MultiClient/RenderPanel.cs
+++ b/BizHawk.MultiClient/RenderPanel.cs
@@ -347,7 +347,8 @@ namespace BizHawk.MultiClient
                     + "/" + Global.MainForm.UserMovie.GetMovieLength().ToString();
             }
             else if (Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.RECORD)
-                return "E" + Global.Emulator.Frame.ToString() + " " + Global.MainForm.UserMovie.lastLog.ToString();
+                return "E" + Global.Emulator.Frame.ToString() + " " + Global.MainForm.UserMovie.lastLog.ToString() +
+                    " length: " + Global.MainForm.UserMovie.GetMovieLength().ToString();
             else
             {
                 return Global.Emulator.Frame.ToString();
diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index e94e0573a0..59dfd4fe67 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -304,6 +304,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() + " input frames saved.");
         }
 
         public void LoadLogFromSavestateText(TextReader reader)