diff --git a/desmume/src/gtk-glade/glade/DeSmuMe.glade b/desmume/src/gtk-glade/glade/DeSmuMe.glade
index 453bac9f2..3c7c866f8 100755
--- a/desmume/src/gtk-glade/glade/DeSmuMe.glade
+++ b/desmume/src/gtk-glade/glade/DeSmuMe.glade
@@ -98,110 +98,119 @@
 			<widget class="GtkMenu" id="load_state_menu">
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate1">
+			    <widget class="GtkRadioMenuItem" id="loadstate1">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 1</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
-			      <signal name="activate" handler="on_loadstate1_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
+			      <signal name="activate" handler="on_loadstate1_activate" last_modification_time="Sun, 21 Jan 2007 06:23:50 GMT"/>
 			      <accelerator key="F1" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate2">
+			    <widget class="GtkRadioMenuItem" id="loadstate2">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 2</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate2_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F2" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate3">
+			    <widget class="GtkRadioMenuItem" id="loadstate3">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 3</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate3_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F3" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate4">
+			    <widget class="GtkRadioMenuItem" id="loadstate4">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 4</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate4_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F4" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate5">
+			    <widget class="GtkRadioMenuItem" id="loadstate5">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 5</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate5_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F5" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate6">
+			    <widget class="GtkRadioMenuItem" id="loadstate6">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 6</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate6_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F6" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate7">
+			    <widget class="GtkRadioMenuItem" id="loadstate7">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 7</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate7_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F7" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate8">
+			    <widget class="GtkRadioMenuItem" id="loadstate8">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 8</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate8_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F8" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate9">
+			    <widget class="GtkRadioMenuItem" id="loadstate9">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 9</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate9_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F9" modifiers="0" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="loadstate10">
+			    <widget class="GtkRadioMenuItem" id="loadstate10">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 10</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">loadstate1</property>
 			      <signal name="activate" handler="on_loadstate10_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F10" modifiers="0" signal="activate"/>
 			    </widget>
@@ -221,7 +230,7 @@
 			<widget class="GtkMenu" id="save_state_menu">
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate1">
+			    <widget class="GtkRadioMenuItem" id="savestate1">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 1</property>
 			      <property name="use_underline">True</property>
@@ -232,99 +241,108 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate2">
+			    <widget class="GtkRadioMenuItem" id="savestate2">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 2</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate2_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F2" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate3">
+			    <widget class="GtkRadioMenuItem" id="savestate3">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 3</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate3_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F3" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate4">
+			    <widget class="GtkRadioMenuItem" id="savestate4">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 4</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate4_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F4" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate5">
+			    <widget class="GtkRadioMenuItem" id="savestate5">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 5</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate5_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F5" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate6">
+			    <widget class="GtkRadioMenuItem" id="savestate6">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 6</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate6_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F6" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate7">
+			    <widget class="GtkRadioMenuItem" id="savestate7">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 7</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate7_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F7" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate8">
+			    <widget class="GtkRadioMenuItem" id="savestate8">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 8</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate8_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F8" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate9">
+			    <widget class="GtkRadioMenuItem" id="savestate9">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 9</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate9_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F9" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckMenuItem" id="savestate10">
+			    <widget class="GtkRadioMenuItem" id="savestate10">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">State 10</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
+			      <property name="group">savestate1</property>
 			      <signal name="activate" handler="on_savestate10_activate" last_modification_time="Thu, 18 Jan 2007 10:10:14 GMT"/>
 			      <accelerator key="F10" modifiers="GDK_SHIFT_MASK" signal="activate"/>
 			    </widget>
@@ -376,7 +394,7 @@
 		      <signal name="activate" handler="on_menu_reset_activate" last_modification_time="Mon, 01 Jan 2007 16:40:47 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image81">
+			<widget class="GtkImage" id="image96">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -413,7 +431,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">0</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="activate" handler="on_fs0_activate" last_modification_time="Tue, 02 Jan 2007 14:35:13 GMT"/>
 			    </widget>
 			  </child>
@@ -511,7 +529,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">9</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">False</property>
+			      <property name="active">True</property>
 			      <property name="group">fs0</property>
 			      <signal name="activate" handler="on_fs9_activate" last_modification_time="Mon, 01 Jan 2007 16:45:37 GMT"/>
 			    </widget>
@@ -535,7 +553,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">1x</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="activate" handler="on_size1x_activate" last_modification_time="Mon, 01 Jan 2007 20:14:20 GMT"/>
 			    </widget>
 			  </child>
@@ -556,7 +574,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">3x</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">False</property>
+			      <property name="active">True</property>
 			      <property name="group">size1x</property>
 			      <signal name="activate" handler="on_size3x_activate" last_modification_time="Mon, 01 Jan 2007 20:14:20 GMT"/>
 			    </widget>
@@ -587,7 +605,7 @@
 		      <signal name="activate" handler="on_menu_controls_activate" last_modification_time="Mon, 01 Jan 2007 16:53:11 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image82">
+			<widget class="GtkImage" id="image97">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -608,7 +626,7 @@
 		      <signal name="activate" handler="on_menu_joy_controls_activate" last_modification_time="Fri, 12 Jan 2007 22:26:36 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image83">
+			<widget class="GtkImage" id="image98">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -682,7 +700,7 @@
 		      <signal name="activate" handler="on_menu_IO_regs_activate" last_modification_time="Mon, 01 Jan 2007 16:53:11 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image84">
+			<widget class="GtkImage" id="image99">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-properties</property>
 			  <property name="icon_size">1</property>
@@ -703,7 +721,7 @@
 		      <signal name="activate" handler="on_menu_memview_activate" last_modification_time="Fri, 12 Jan 2007 15:44:42 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image85">
+			<widget class="GtkImage" id="image100">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-properties</property>
 			  <property name="icon_size">1</property>
@@ -724,7 +742,7 @@
 		      <signal name="activate" handler="on_menu_palview_activate" last_modification_time="Sun, 14 Jan 2007 10:34:32 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image86">
+			<widget class="GtkImage" id="image101">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-properties</property>
 			  <property name="icon_size">1</property>
diff --git a/desmume/src/gtk-glade/main.c b/desmume/src/gtk-glade/main.c
index b3208332f..268a9ce13 100755
--- a/desmume/src/gtk-glade/main.c
+++ b/desmume/src/gtk-glade/main.c
@@ -156,9 +156,6 @@ void update_savestate_menu(char * cb_name, u8 num)
   sprintf( cb, "%s%d", cb_name, num);
   w = glade_xml_get_widget(xml, cb);
   set_menuitem_label( w, savestates[num-1].date );
-  /* FIXME: Uncommenting the following makes DeSmuME go crazy.
-     It triggers the callback (update_savestate) on activate. */
-/*   gtk_check_menu_item_set_active((GtkCheckMenuItem*)w, TRUE);  */
 }
 
 void update_savestates_menu()
@@ -184,7 +181,6 @@ void update_savestates_menu()
 
 void update_savestate(u8 num)
 {
-  printf("Update savestate!\n");
   desmume_pause();
   savestate_slot(num);
   update_savestate_menu("savestate", num);