From edd9e65e9e031085de14dbebe4274d96936272c6 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 22 Dec 2013 15:26:09 +0000
Subject: [PATCH] Toolbox - fix focus issue on load

---
 BizHawk.Client.EmuHawk/tools/ToolBox.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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()