diff --git a/pkg/emscripten/proto.html b/pkg/emscripten/proto.html
index 43da05c899..979a568ff9 100644
--- a/pkg/emscripten/proto.html
+++ b/pkg/emscripten/proto.html
@@ -38,53 +38,53 @@
                   <div class="dropdown">
                    <li class="nav-item dropdown">
                        <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Core Selection</button>
-                       <div class="dropdown-menu dropdown-primary" aria-labelledby="dropdownMenu1" data-dropdown-in="fadeIn" data-dropdown-out="fadeOut">
-                          <a class="dropdown-item" href="." onclick=switchCore("2048")>2048</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("4do")>4DO</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("bluemsx")>BlueMSX</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("craft")>Craft</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("desmume")>DeSmuME</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("dosbox")>DOSBox</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("easyrpg")>EasyRPG</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("fbalpha2012")>FB Alpha 2012</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("fbalpha2012_cps1")>FB Alpha 2012 CPS1</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("fbalpha2012_cps2")>FB Alpha 2012 CPS2</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("fbalpha2012_neo")>FB Alpha 2012 NeoGeo</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("fceumm")>FCEUmm</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("ffmpeg")>FFmpeg</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("gambatte")>Gambatte</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("genesis_plus_gx")>Genesis Plus GX</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("gme")>Game Music Emu</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("gpsp")>gPSP</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("handy")>Handy</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mame2000")>MAME 2000</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mednafen_lynx")>Mednafen Lynx</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mednafen_ngp")>Mednafen Neo Geo Pocket</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mednafen_pce_fast")>Mednafen PC Engine Fast</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mednafen_pcfx")>Mednafen/Beetle PCFX</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mednafen_psx")>Mednafen/Beetle PSX</a>
-                          <!--<a class="dropdown-item" href="." onclick=switchCore("mednafen_saturn")>Mednafen/Beetle Saturn</a>-->
-                          <a class="dropdown-item" href="." onclick=switchCore("mednafen_snes")>Mednafen/Beetle SNES</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mednafen_vb")>Mednafen/Beetle Virtual Boy</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mednafen_wswan")>Mednafen/Beetle WonderSwan</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("mupen64plus")>Mupen64 Plus</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("nestopia")>Nestopia</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("nxengine")>NX Engine</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("o2em")>O2em</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("picodrive")>PicoDrive</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("prboom")>PrBoom</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("quicknes")>QuickNES</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("snes9x2002")>Snes9x 2002</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("snes9x2005")>Snes9x 2005</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("snes9x2010")>Snes9x 2010</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("snes9x")>Snes9x</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("stella")>Stella</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("tgbdual")>TGB Dual</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("tyrquake")>TyrQuake</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("vba_next")>VBA Next</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("vecx")>Vecx</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("virtualjaguar")>Virtual Jaguar</a>
-                          <a class="dropdown-item" href="." onclick=switchCore("yabause")>Yabause</a>
+                       <div class="dropdown-menu dropdown-primary" aria-labelledby="dropdownMenu1" data-dropdown-in="fadeIn" data-dropdown-out="fadeOut" id="core-selector">
+                          <a class="dropdown-item" href="." data-core="2048">2048</a>
+                          <a class="dropdown-item" href="." data-core="4do">4DO</a>
+                          <a class="dropdown-item" href="." data-core="bluemsx">BlueMSX</a>
+                          <a class="dropdown-item" href="." data-core="craft">Craft</a>
+                          <a class="dropdown-item" href="." data-core="desmume">DeSmuME</a>
+                          <a class="dropdown-item" href="." data-core="dosbox">DOSBox</a>
+                          <a class="dropdown-item" href="." data-core="easyrpg">EasyRPG</a>
+                          <a class="dropdown-item" href="." data-core="fbalpha2012">FB Alpha 2012</a>
+                          <a class="dropdown-item" href="." data-core="fbalpha2012_cps1">FB Alpha 2012 CPS1</a>
+                          <a class="dropdown-item" href="." data-core="fbalpha2012_cps2">FB Alpha 2012 CPS2</a>
+                          <a class="dropdown-item" href="." data-core="fbalpha2012_neo">FB Alpha 2012 NeoGeo</a>
+                          <a class="dropdown-item" href="." data-core="fceumm">FCEUmm</a>
+                          <a class="dropdown-item" href="." data-core="ffmpeg">FFmpeg</a>
+                          <a class="dropdown-item" href="." data-core="gambatte">Gambatte</a>
+                          <a class="dropdown-item" href="." data-core="genesis_plus_gx">Genesis Plus GX</a>
+                          <a class="dropdown-item" href="." data-core="gme">Game Music Emu</a>
+                          <a class="dropdown-item" href="." data-core="gpsp">gPSP</a>
+                          <a class="dropdown-item" href="." data-core="handy">Handy</a>
+                          <a class="dropdown-item" href="." data-core="mame2000">MAME 2000</a>
+                          <a class="dropdown-item" href="." data-core="mednafen_lynx">Mednafen Lynx</a>
+                          <a class="dropdown-item" href="." data-core="mednafen_ngp">Mednafen Neo Geo Pocket</a>
+                          <a class="dropdown-item" href="." data-core="mednafen_pce_fast">Mednafen PC Engine Fast</a>
+                          <a class="dropdown-item" href="." data-core="mednafen_pcfx">Mednafen/Beetle PCFX</a>
+                          <a class="dropdown-item" href="." data-core="mednafen_psx">Mednafen/Beetle PSX</a>
+                          <!--<a class="dropdown-item" href="." data-core="mednafen_saturn">Mednafen/Beetle Saturn</a>-->
+                          <a class="dropdown-item" href="." data-core="mednafen_snes">Mednafen/Beetle SNES</a>
+                          <a class="dropdown-item" href="." data-core="mednafen_vb">Mednafen/Beetle Virtual Boy</a>
+                          <a class="dropdown-item" href="." data-core="mednafen_wswan">Mednafen/Beetle WonderSwan</a>
+                          <a class="dropdown-item" href="." data-core="mupen64plus">Mupen64 Plus</a>
+                          <a class="dropdown-item" href="." data-core="nestopia">Nestopia</a>
+                          <a class="dropdown-item" href="." data-core="nxengine">NX Engine</a>
+                          <a class="dropdown-item" href="." data-core="o2em">O2em</a>
+                          <a class="dropdown-item" href="." data-core="picodrive">PicoDrive</a>
+                          <a class="dropdown-item" href="." data-core="prboom">PrBoom</a>
+                          <a class="dropdown-item" href="." data-core="quicknes">QuickNES</a>
+                          <a class="dropdown-item" href="." data-core="snes9x2002">Snes9x 2002</a>
+                          <a class="dropdown-item" href="." data-core="snes9x2005">Snes9x 2005</a>
+                          <a class="dropdown-item" href="." data-core="snes9x2010">Snes9x 2010</a>
+                          <a class="dropdown-item" href="." data-core="snes9x">Snes9x</a>
+                          <a class="dropdown-item" href="." data-core="stella">Stella</a>
+                          <a class="dropdown-item" href="." data-core="tgbdual">TGB Dual</a>
+                          <a class="dropdown-item" href="." data-core="tyrquake">TyrQuake</a>
+                          <a class="dropdown-item" href="." data-core="vba_next">VBA Next</a>
+                          <a class="dropdown-item" href="." data-core="vecx">Vecx</a>
+                          <a class="dropdown-item" href="." data-core="virtualjaguar">Virtual Jaguar</a>
+                          <a class="dropdown-item" href="." data-core="yabause">Yabause</a>
                        </div>
 
                       <button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()">
diff --git a/pkg/emscripten/proto.js b/pkg/emscripten/proto.js
index 3b166dc496..caf5e238e2 100644
--- a/pkg/emscripten/proto.js
+++ b/pkg/emscripten/proto.js
@@ -290,13 +290,20 @@ $(function() {
     }
   });
 
+   // Switch the core when selecting one.
+   $('#core-selector a').click(function () {
+      var coreChoice = $(this).data('core');
+      switchCore(coreChoice);
+   });
+
    // Find which core to load.
    var core = localStorage.getItem("core", core);
    if (!core) {
-     core = 'gambatte';
+      core = 'gambatte';
    }
-   // Show the current core as the active core.
-   $('.nav-item.' + core).addClass('active');
+   // Make the core the selected core in the UI.
+   var coreTitle = $('#core-selector a[data-core="' + core + '"]').addClass('active').text();
+   $('#dropdownMenu1').text(coreTitle);
 
    // Load the Core's related JavaScript.
    $.getScript(core + '_libretro.js', function ()