diff --git a/BizHawk.Client.Common/movie/TasMovie.cs b/BizHawk.Client.Common/movie/TasMovie.cs
index 3f20f3c778..d2ff56eb4c 100644
--- a/BizHawk.Client.Common/movie/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/TasMovie.cs
@@ -114,7 +114,7 @@ namespace BizHawk.Client.Common
 
 		public bool IsCountingRerecords { get; set; }
 
-		public bool Changes { get; private set; }
+		public bool Changes { get; set; }
 
 		public TimeSpan Time
 		{
@@ -188,6 +188,9 @@ namespace BizHawk.Client.Common
 
 		public void Stop(bool saveChanges = true)
 		{
+			// adelikat: I think Tastudio should be in charge of saving, and so we should not attempt to manage any logic like that here
+			// EmuHawk client UI assumes someone has already picked a filename ahead of time and that it is in charge of movies
+			/*
 			if (saveChanges)
 			{
 				if (_mode == Moviemode.Record || Changes)
@@ -195,7 +198,7 @@ namespace BizHawk.Client.Common
 					Save();
 				}
 			}
-
+			*/
 			_mode = Moviemode.Inactive;
 		}
 
@@ -272,8 +275,9 @@ namespace BizHawk.Client.Common
 		{
 			SwitchToRecord();
 
-			// TODO: MakeBackup logic - Tastudio logic shoudl be to always make backups before saving!
-			if (Global.Config.EnableBackupMovies && _records.Any() && !String.IsNullOrWhiteSpace(Filename))
+			// TODO: MakeBackup logic - Tastudio logic should be to always make backups before saving!
+
+			if (Changes && !String.IsNullOrWhiteSpace(Filename))
 			{
 				Save();
 			}
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 9aefa1f35e..ef9e123aed 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -48,14 +48,17 @@ namespace BizHawk.Client.EmuHawk
 				Global.Emulator.ResetCounters();
 			}
 
-			if (record)
+			if (!fromTastudio)
 			{
-				Global.MovieSession.Movie.StartNewRecording();
-				Global.MovieSession.ReadOnly = false;
-			}
-			else
-			{
-				Global.MovieSession.Movie.StartNewPlayback();
+				if (record)
+				{
+					Global.MovieSession.Movie.StartNewRecording();
+					Global.MovieSession.ReadOnly = false;
+				}
+				else
+				{
+					Global.MovieSession.Movie.StartNewPlayback();
+				}
 			}
 
 			SetMainformMovieInfo();
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index a345de89ba..6d67e0f40b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -11,6 +11,8 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class TAStudio : Form, IToolForm
 	{
+		// TODO: UI flow that conveniently allows to start from savestate
+
 		private const string MarkerColumnName = "MarkerColumn";
 		private const string FrameColumnName = "FrameColumn";
 
@@ -39,6 +41,7 @@ namespace BizHawk.Client.EmuHawk
 					if (Global.MovieSession.Movie is TasMovie)
 					{
 						Global.MovieSession.Movie = new Movie();
+						GlobalWin.MainForm.StopMovie(saveChanges: false);
 					}
 				}
 				else
@@ -54,7 +57,27 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool AskSave()
 		{
-			// TODO: eventually we want to do this
+			if (_tas.Changes)
+			{
+				GlobalWin.Sound.StopSound();
+				var result = MessageBox.Show("Save Changes?", "Tastudio", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3);
+				GlobalWin.Sound.StartSound();
+				if (result == DialogResult.Yes)
+				{
+					SaveTASMenuItem_Click(null, null);
+				}
+				else if (result == DialogResult.No)
+				{
+					_tas.Changes = false;
+					return true;
+				}
+				else if (result == DialogResult.Cancel)
+				{
+					return false;
+				}
+
+			}
+
 			return true;
 		}
 
@@ -149,26 +172,17 @@ namespace BizHawk.Client.EmuHawk
 			_tas = Global.MovieSession.Movie as TasMovie;
 			_tas.StartNewRecording();
 			_tas.OnChanged += OnMovieChanged;
-
-			try
-			{
-				GlobalWin.MainForm.StartNewMovie(_tas, true, true);
-				
-			}
-			catch (Exception e)
-			{
-				MessageBox.Show(e.Message);
-			}
+			GlobalWin.MainForm.StartNewMovie(_tas, true, true);
 		}
 
 		private void StartNewSession()
 		{
 			if (AskSave())
 			{
-				// TODO: power-cycle
-				// TODO: UI flow that conveniently allows to start from savestate
 				GlobalWin.OSD.AddMessage("new TAStudio session started");
 				_tas.StartNewRecording();
+				GlobalWin.MainForm.StartNewMovie(_tas, true, true);
+				TASView.ItemCount = _tas.InputLogLength;
 			}
 		}
 
@@ -284,7 +298,14 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SaveTASMenuItem_Click(object sender, EventArgs e)
 		{
-			_tas.Save();
+			if (String.IsNullOrEmpty(_tas.Filename))
+			{
+				SaveAsTASMenuItem_Click(sender, e);
+			}
+			else
+			{
+				_tas.Save();
+			}
 			// TODO: inform the user it happened somehow
 		}