diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index f565d8b4d6..657f8edf57 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -1180,6 +1180,7 @@ namespace BizHawk.Client.EmuHawk
 			this.MinimumSize = new System.Drawing.Size(200, 148);
 			this.Name = "TAStudio";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Deactivate += new System.EventHandler(this.TAStudio_Deactivate);
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing);
 			this.Load += new System.EventHandler(this.Tastudio_Load);
 			this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragDrop);
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 50dc99111e..aba4049497 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -1004,7 +1004,19 @@ namespace BizHawk.Client.EmuHawk
 		private void TAStudio_MouseLeave(object sender, EventArgs e)
 		{
 			toolTip1.SetToolTip(TasView, null);
-			DoTriggeredAutoRestoreIfNeeded();
+		}
+
+		private void TAStudio_Deactivate(object sender, EventArgs e)
+		{
+			if (_leftButtonHeld)
+			{
+				TasView_MouseUp(this, new(MouseButtons.Left, 0, 0, 0, 0));
+			}
+			if (_rightClickFrame != -1)
+			{
+				_suppressContextMenu = true;
+				TasView_MouseUp(this, new(MouseButtons.Right, 0, 0, 0, 0));
+			}
 		}
 
 		protected override bool ProcessCmdKey(ref Message msg, Keys keyData)