diff --git a/stella/src/gp2x/OSystemGP2X.cxx b/stella/src/gp2x/OSystemGP2X.cxx
index 68689102f..75ed7b6d3 100644
--- a/stella/src/gp2x/OSystemGP2X.cxx
+++ b/stella/src/gp2x/OSystemGP2X.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OSystemGP2X.cxx,v 1.15 2006-12-03 19:19:34 azaballa Exp $
+// $Id: OSystemGP2X.cxx,v 1.16 2006-12-06 07:02:50 azaballa Exp $
 // Modified on 2006/01/06 by Alex Zaballa for use on GP2X
 //============================================================================
 
@@ -141,8 +141,8 @@ void OSystemGP2X::setDefaultJoymap()
   myEventHandler->setDefaultJoyMapping(Event::ConsoleSelect, kEmulationMode, 0, 11);	// R
   myEventHandler->setDefaultJoyMapping(Event::CmdMenuMode, kEmulationMode, 0, 12);	// A
   myEventHandler->setDefaultJoyMapping(Event::JoystickZeroFire, kEmulationMode, 0, 13);	// B
-  myEventHandler->setDefaultJoyMapping(Event::Pause, kEmulationMode, 0, 14);		// X
-  myEventHandler->setDefaultJoyMapping(Event::MenuMode, kEmulationMode, 0, 15);		// Y
+  myEventHandler->setDefaultJoyMapping(Event::MenuMode, kEmulationMode, 0, 14);         // Y
+  myEventHandler->setDefaultJoyMapping(Event::Pause, kEmulationMode, 0, 15);		// X
   myEventHandler->setDefaultJoyMapping(Event::VolumeIncrease, kEmulationMode, 0, 16);	// Vol+
   myEventHandler->setDefaultJoyMapping(Event::VolumeDecrease, kEmulationMode, 0, 17);	// Vol-
   myEventHandler->setDefaultJoyMapping(Event::NoType, kEmulationMode, 0, 18);		// Click
@@ -151,10 +151,10 @@ void OSystemGP2X::setDefaultJoymap()
   myEventHandler->setDefaultJoyMapping(Event::UIOK, kMenuMode, 0, 9);			// Select
   myEventHandler->setDefaultJoyMapping(Event::UIPgUp, kMenuMode, 0, 10);		// L
   myEventHandler->setDefaultJoyMapping(Event::UIPgDown, kMenuMode, 0, 11);		// R
-  myEventHandler->setDefaultJoyMapping(Event::UITabNext, kMenuMode, 0, 12);		// A
+  myEventHandler->setDefaultJoyMapping(Event::UITabPrev, kMenuMode, 0, 12);		// A
   myEventHandler->setDefaultJoyMapping(Event::UISelect, kMenuMode, 0, 13);		// B
-  myEventHandler->setDefaultJoyMapping(Event::UITabPrev, kMenuMode, 0, 14);		// X
-  myEventHandler->setDefaultJoyMapping(Event::UICancel, kMenuMode, 0, 15);		// Y
+  myEventHandler->setDefaultJoyMapping(Event::UITabNext, kMenuMode, 0, 14);             // Y
+  myEventHandler->setDefaultJoyMapping(Event::UICancel, kMenuMode, 0, 15);		// X
   myEventHandler->setDefaultJoyMapping(Event::UINavNext, kMenuMode, 0, 16);		// Vol+
   myEventHandler->setDefaultJoyMapping(Event::UINavPrev, kMenuMode, 0, 17);		// Vol-
   myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 18);		// Click