diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index ef96a80e99..00377e4754 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -709,12 +709,10 @@ namespace BizHawk.Client.EmuHawk
 			{
 				GlobalWin.Tools.Load<GBGameGenie>();
 			}
-			/* adelikat: Genesis decoding doesn't seem to work yet
-			else if (Global.Emulator.SystemId == "GEN")
+			else if (Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM)
 			{
 				GlobalWin.Tools.Load<GenGameGenie>();
 			}
-			*/
 		}
 
 		public void LoadTraceLogger()
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
index 6900da92e4..c282a9b245 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
@@ -200,7 +200,7 @@ namespace BizHawk.Client.EmuHawk
 			GameGenieToolbarSeparator.Visible =
 				LoadGameGenieToolbarItem.Visible =
 				((Global.Emulator is NES)
-				/*|| (Global.Emulator.SystemId == "GEN")*/
+				|| (Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM)
 				|| (Global.Emulator.SystemId == "GB")
 				|| (Global.Game.System == "GG")
 				|| (Global.Emulator is LibsnesCore));
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
index 72c18c7938..9e14524946 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
@@ -49,6 +49,7 @@
 			this.GBGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
 			this.PceBgViewerToolbarItem = new System.Windows.Forms.ToolStripButton();
 			this.GbaGpuViewerToolBarItem = new System.Windows.Forms.ToolStripButton();
+			this.GenesisGameGenieToolBarItem = new System.Windows.Forms.ToolStripButton();
 			this.ToolBoxStrip.SuspendLayout();
 			this.SuspendLayout();
 			// 
@@ -81,7 +82,8 @@
             this.GbGpuViewerToolBarItem,
             this.GBGameGenieToolbarItem,
             this.PceBgViewerToolbarItem,
-            this.GbaGpuViewerToolBarItem});
+            this.GbaGpuViewerToolBarItem,
+            this.GenesisGameGenieToolBarItem});
 			this.ToolBoxStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
 			this.ToolBoxStrip.Location = new System.Drawing.Point(2, 2);
 			this.ToolBoxStrip.Name = "ToolBoxStrip";
@@ -273,6 +275,16 @@
 			this.GbaGpuViewerToolBarItem.ToolTipText = "Gameboy Advance Gpu Viewer";
 			this.GbaGpuViewerToolBarItem.Click += new System.EventHandler(this.GbaGpuViewerToolBarItem_Click);
 			// 
+			// GenesisGameGenieToolBarItem
+			// 
+			this.GenesisGameGenieToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GenesisControllerIcon;
+			this.GenesisGameGenieToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.GenesisGameGenieToolBarItem.Name = "GenesisGameGenieToolBarItem";
+			this.GenesisGameGenieToolBarItem.Size = new System.Drawing.Size(43, 20);
+			this.GenesisGameGenieToolBarItem.Text = "GG";
+			this.GenesisGameGenieToolBarItem.ToolTipText = "Genesis Game Genie Encoder/Decoder";
+			this.GenesisGameGenieToolBarItem.Click += new System.EventHandler(this.GenesisGameGenieToolBarItem_Click);
+			// 
 			// ToolBox
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -313,6 +325,7 @@
 		private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem;
 		private System.Windows.Forms.ToolStripButton GbGpuViewerToolBarItem;
 		private System.Windows.Forms.ToolStripButton GbaGpuViewerToolBarItem;
+		private System.Windows.Forms.ToolStripButton GenesisGameGenieToolBarItem;
 
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 9a9e78b38b..5fbcbcbb74 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -68,6 +68,8 @@ namespace BizHawk.Client.EmuHawk
 
 			GbaGpuViewerToolBarItem.Visible = Global.Emulator is GBA;
 
+			GenesisGameGenieToolBarItem.Visible = Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM;
+
 			foreach (var button in ToolBoxItems)
 			{
 				if (button.Visible)
@@ -207,6 +209,11 @@ namespace BizHawk.Client.EmuHawk
 			GlobalWin.Tools.Load<GBAGPUView>();
 		}
 
+		private void GenesisGameGenieToolBarItem_Click(object sender, EventArgs e)
+		{
+			GlobalWin.Tools.Load<GenGameGenie>();
+		}
+
 		#endregion
 	}
 }