diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index b940fbf668..f5a8fbf3f7 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3583,6 +3583,9 @@ namespace BizHawk.Client.EmuHawk
 				StopMovie(true);
 			}
 
+			if (GlobalWin.Tools.IsLoaded<TraceLogger>())
+				GlobalWin.Tools.Get<TraceLogger>().Restart();
+
 			Global.CheatList.SaveOnClose();
 			Global.Emulator.Dispose();
 			var coreComm = CreateCoreComm();
diff --git a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
index 6dfdadc74c..89e16166fc 100644
--- a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
+++ b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
@@ -105,7 +105,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			ClearList();
 			OpenLogFile.Enabled = false;
-			//Tracer.Enabled = LoggingEnabled.Checked = false;
+			LoggingEnabled.Checked = false;
+			Tracer.Sink = null;
 			SetTracerBoxTitle();
 		}
 
@@ -187,8 +188,13 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Restart()
 		{
+			CloseFile();
 			ClearList();
-			//Tracer.Enabled = LoggingEnabled.Checked = false;
+			LoggingEnabled.Checked = false;
+			ToFileRadio.Checked = false;
+			ToWindowRadio.Checked = true;
+			OpenLogFile.Enabled = false;
+			Tracer.Sink = null;
 			SetTracerBoxTitle();
 		}
 
@@ -466,6 +472,7 @@ namespace BizHawk.Client.EmuHawk
 				CloseFile();
 				FileBox.Visible = false;
 				BrowseBox.Visible = false;
+				OpenLogFile.Enabled = false;
 			}
 
 			SetTracerBoxTitle();