diff --git a/BizHawk.MultiClient/LogConsole.cs b/BizHawk.MultiClient/LogConsole.cs
index f61845cc45..b9cd0688d9 100644
--- a/BizHawk.MultiClient/LogConsole.cs
+++ b/BizHawk.MultiClient/LogConsole.cs
@@ -271,6 +271,7 @@ namespace BizHawk.MultiClient
 			if (NeedToRelease)
 			{
 				ReleaseConsole();
+				NeedToRelease = false;
 			}
 			else
 			{
diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index 84c98085b9..875f3192c7 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -972,9 +972,9 @@ namespace BizHawk.MultiClient
 			Global.Config.ShowLogWindow ^= true;
 			displayLogWindowToolStripMenuItem.Checked = Global.Config.ShowLogWindow;
 			if (Global.Config.ShowLogWindow)
-				LogConsole.ShowConsole();
+				ShowConsole();
 			else
-				LogConsole.HideConsole();
+				HideConsole();
 		}
 
 		private void PauseStrip_Click(object sender, EventArgs e)
@@ -1426,4 +1426,4 @@ namespace BizHawk.MultiClient
 			ShowHideMenu();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 840f1597e4..ae985b2c9c 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -75,7 +75,7 @@ namespace BizHawk.MultiClient
 			Global.Game = GameInfo.GetNullGame();
 			if (Global.Config.ShowLogWindow)
 			{
-				LogConsole.ShowConsole();
+				ShowConsole();
 				//PsxApi.StdioFixes();
 				displayLogWindowToolStripMenuItem.Checked = true;
 			}
@@ -2728,9 +2728,23 @@ namespace BizHawk.MultiClient
         {
             Global.Config.SkipLagFrame ^= true;
         }
+
+		private void ShowConsole()
+		{
+			LogConsole.ShowConsole();
+			logWindowAsConsoleToolStripMenuItem.Enabled = false;
+		}
+
+		private void HideConsole()
+		{
+			LogConsole.HideConsole();
+			logWindowAsConsoleToolStripMenuItem.Enabled = true;
+		}
+
 		public void notifyLogWindowClosing()
 		{
 			displayLogWindowToolStripMenuItem.Checked = false;
+			logWindowAsConsoleToolStripMenuItem.Enabled = true;
 		}
 	}
 }