diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 41110bf67f..58d2cb9267 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -93,6 +93,10 @@ namespace BizHawk.Client.EmuHawk
 
 			SmsVdpToolbarItem.Visible = Global.Emulator is SMS;
 
+			NesDebuggerToolbarItem.Visible = VersionInfo.DeveloperBuild && Global.Emulator.SystemId == "NES";
+
+			TAStudioToolbarItem.Visible = Global.Emulator.HasSavestates();
+
 			foreach (var button in ToolBoxItems)
 			{
 				if (button.Visible)
@@ -101,8 +105,6 @@ namespace BizHawk.Client.EmuHawk
 					toolBtn.Click += (o, e) => Close();
 				}
 			}
-
-			NesDebuggerToolbarItem.Visible = VersionInfo.DeveloperBuild && Global.Emulator.SystemId == "NES";
 		}
 
 		private void SetSize()