diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
index a90449e54c..fff7e63bc9 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
@@ -29,7 +29,6 @@
 		private void InitializeComponent()
 		{
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToolBox));
-			this.CloseBtn = new System.Windows.Forms.Button();
 			this.ToolBoxStrip = new ToolStripEx();
 			this.CheatsToolBarItem = new System.Windows.Forms.ToolStripButton();
 			this.RamWatchToolbarItem = new System.Windows.Forms.ToolStripButton();
@@ -52,19 +51,6 @@
 			this.ToolBoxStrip.SuspendLayout();
 			this.SuspendLayout();
 			// 
-			// CloseBtn
-			// 
-			this.CloseBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.CloseBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.CloseBtn.Location = new System.Drawing.Point(152, 110);
-			this.CloseBtn.Name = "CloseBtn";
-			this.CloseBtn.Size = new System.Drawing.Size(0, 23);
-			this.CloseBtn.TabIndex = 1;
-			this.CloseBtn.TabStop = false;
-			this.CloseBtn.UseVisualStyleBackColor = true;
-			this.CloseBtn.Click += new System.EventHandler(this.CloseBtn_Click);
-			this.CloseBtn.Enter += new System.EventHandler(this.CloseBtn_Enter);
-			// 
 			// ToolBoxStrip
 			// 
 			this.ToolBoxStrip.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -279,9 +265,7 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.CloseBtn;
 			this.ClientSize = new System.Drawing.Size(140, 145);
-			this.Controls.Add(this.CloseBtn);
 			this.Controls.Add(this.ToolBoxStrip);
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.MaximumSize = new System.Drawing.Size(270, 600);
@@ -314,7 +298,6 @@
 		private System.Windows.Forms.ToolStripButton TAStudioToolbarItem;
 		private System.Windows.Forms.ToolStripButton GGGameGenieToolbarItem;
 		private System.Windows.Forms.ToolStripButton PceBgViewerToolbarItem;
-		private System.Windows.Forms.Button CloseBtn;
 		private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem;
 		private System.Windows.Forms.ToolStripButton GbGpuViewerToolBarItem;
 
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 5cccf8e7da..a33ae8a487 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -92,14 +92,17 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void CloseBtn_Click(object sender, EventArgs e)
+		protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
 		{
-			Close();
-		}
-
-		private void CloseBtn_Enter(object sender, EventArgs e)
-		{
-			//ToolBoxStrip.Focus();
+			if (keyData == Keys.Escape)
+			{
+				Close();
+				return true;
+			}
+			else
+			{
+				return base.ProcessCmdKey(ref msg, keyData);
+			}
 		}
 
 		#region Icon Clicks