diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index a33ae8a487..b88c98bed2 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -27,9 +27,9 @@ namespace BizHawk.Client.EmuHawk
 			);
 
 			SetTools();
-			ToolBoxItems.First().Select();
 			SetSize();
 
+			ToolBoxStrip.Select();
 			ToolBoxItems.First().Select();
 		}
 
@@ -73,6 +73,8 @@ namespace BizHawk.Client.EmuHawk
 					toolBtn.Click += (o, e) => Close();
 				}
 			}
+
+			NesDebuggerToolbarItem.Visible = !VersionInfo.INTERIM;
 		}
 
 		private void SetSize()