diff --git a/gtk/src/gtk_config.cpp b/gtk/src/gtk_config.cpp
index 8ec6b70e..f3bc9c12 100644
--- a/gtk/src/gtk_config.cpp
+++ b/gtk/src/gtk_config.cpp
@@ -201,7 +201,6 @@ Snes9xConfig::load_defaults (void)
     Settings.ReverseStereo = FALSE;
     Settings.SoundPlaybackRate = 32000;
     Settings.DisableHDMA = 0;
-    Settings.ShutdownMaster = 0;
     Settings.StopEmulation = TRUE;
     Settings.DisableIRQ = FALSE;
     Settings.FrameTimeNTSC = 16667;
@@ -364,7 +363,6 @@ Snes9xConfig::save_config_file (void)
     xml_out_int (xml, "stereo", Settings.Stereo);
     xml_out_int (xml, "reverse_stereo", Settings.ReverseStereo);
     xml_out_int (xml, "playback_rate", gui_config->sound_playback_rate);
-    xml_out_int (xml, "speedhacks", Settings.ShutdownMaster);
     xml_out_int (xml, "hdma", !(Settings.DisableHDMA));
     xml_out_int (xml, "block_invalid_vram_access", Settings.BlockInvalidVRAMAccessMaster);
     xml_out_int (xml, "upanddown", Settings.UpAndDown);
@@ -629,7 +627,6 @@ Snes9xConfig::set_option (const char *name, const char *value)
     }
     else if (!strcasecmp (name, "speedhacks"))
     {
-        Settings.ShutdownMaster = atoi (value);
     }
     else if (!strcasecmp (name, "overscan"))
     {
diff --git a/gtk/src/snes9x.ui b/gtk/src/snes9x.ui
index 7947bde1..b26fbd1b 100644
--- a/gtk/src/snes9x.ui
+++ b/gtk/src/snes9x.ui
@@ -6379,6 +6379,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="max_length">21</property>
+                    <property name="activates_default">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>