diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index 72da88a9..9468dc98 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -2338,15 +2338,21 @@ EVT_HANDLER(SyncGameAudio, "Synchronize game to audio")
 	update_opts();
 }
 
-EVT_HANDLER(BootRomEn, "Use the specified BIOS file")
+EVT_HANDLER(BootRomEn, "Use the specified BIOS file for GBA")
 {
 	GetMenuOptionInt("BootRomEn", useBiosFileGBA, 1);
 	update_opts();
 }
 
-EVT_HANDLER(CBootRomEn, "Use the specified BIOS file for GBC")
+EVT_HANDLER(BootRomGB, "Use the specified BIOS file for GB")
 {
-	GetMenuOptionInt("CBootRomEn", useBiosFileGBC, 1);
+	GetMenuOptionInt("BootRomGB", useBiosFileGB, 1);
+	update_opts();
+}
+
+EVT_HANDLER(BootRomGBC, "Use the specified BIOS file for GBC")
+{
+	GetMenuOptionInt("BootRomGBC", useBiosFileGBC, 1);
 	update_opts();
 }
 
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index 3512ba7e..23d5a796 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -227,9 +227,9 @@ opt_desc opts[] = {
 	INTOPT ("preferences/skipSaveGameBattery", "", wxTRANSLATE("Do not overwrite native (battery) save when loading state"), skipSaveGameBattery, 0, 1),
 	INTOPT ("preferences/synchronize", "SyncGameAudio", wxTRANSLATE("Synchronize game to audio"), synchronize, 0, 1),
 	INTOPT ("preferences/throttle", "", wxTRANSLATE("Throttle game speed, even when accelerated (0-1000%, 0 = disabled)"), throttle, 0, 1000),
-	INTOPT ("preferences/useBiosFileGB", "", wxTRANSLATE("Use the specified BIOS file for GB"), useBiosFileGB, 0, 1),
+	INTOPT ("preferences/useBiosGB", "BootRomGB", wxTRANSLATE("Use the specified BIOS file for GB"), useBiosFileGB, 0, 1),
 	INTOPT ("preferences/useBiosGBA", "BootRomEn", wxTRANSLATE("Use the specified BIOS file"), useBiosFileGBA, 0, 1),
-	INTOPT ("preferences/useBiosGBC", "CBootRomEn", wxTRANSLATE("Use the specified BIOS file for GBC"), useBiosFileGBC, 0, 1),
+	INTOPT ("preferences/useBiosGBC", "BootRomGBC", wxTRANSLATE("Use the specified BIOS file for GBC"), useBiosFileGBC, 0, 1),
 	INTOPT ("preferences/vsync", "VSync", wxTRANSLATE("Wait for vertical sync"), vsync, 0, 1),
 
     /// Sound
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index 8a32bc49..f704ed81 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -147,10 +147,10 @@ void GameArea::LoadGame(const wxString &name)
 	wxCharBuffer fnb;
 	if(gbCgbMode) {
 	    use_bios = useBiosFileGBC;
-	    fnb = biosFileNameGBC;
+		fnb = gopts.gbc_bios.mb_fn_str();
 	} else {
 	    use_bios = useBiosFileGB;
-	    fnb = biosFileNameGB;
+	    fnb = gopts.gb_bios.mb_fn_str();
 	}
 	fn = fnb.data();
 	gbCPUInit(fn, use_bios);
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index 047e0f53..e06b87d3 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -244,6 +244,10 @@
         <checkable>1</checkable>
       </object>
       <object class="separator"/>
+      <object class="wxMenuItem" name="SkipIntro">
+        <label>_Skip BIOS</label>
+        <checkable>1</checkable>
+      </object>
       <object class="wxMenuItem" name="ApplyPatches">
         <label>_Auto IPS/UPS/IPF patch</label>
         <checkable>1</checkable>
@@ -406,10 +410,6 @@
           <label>_Use BIOS file</label>
           <checkable>1</checkable>
         </object>
-        <object class="wxMenuItem" name="SkipIntro">
-          <label>_Skip BIOS</label>
-          <checkable>1</checkable>
-        </object>
       </object>
       <object class="wxMenu">
         <label>_Game Boy</label>
@@ -428,7 +428,11 @@
           <label>_Save printouts as screen captures</label>
           <checkable>1</checkable>
         </object>
-        <object class="wxMenuItem" name="CBootRomEn">
+        <object class="wxMenuItem" name="BootRomGB">
+          <label>_Use GB BIOS file</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="BootRomGBC">
           <label>_Use GBC BIOS file</label>
           <checkable>1</checkable>
         </object>