diff --git a/stella/src/emucore/Event.hxx b/stella/src/emucore/Event.hxx
index d48f01874..2473e567d 100644
--- a/stella/src/emucore/Event.hxx
+++ b/stella/src/emucore/Event.hxx
@@ -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: Event.hxx,v 1.26 2007-01-23 09:30:22 knakos Exp $
+// $Id: Event.hxx,v 1.27 2007-01-24 21:36:38 stephena Exp $
 //============================================================================
 
 #ifndef EVENT_HXX
@@ -26,7 +26,7 @@ class EventStreamer;
 
 /**
   @author  Bradford W. Mott
-  @version $Id: Event.hxx,v 1.26 2007-01-23 09:30:22 knakos Exp $
+  @version $Id: Event.hxx,v 1.27 2007-01-24 21:36:38 stephena Exp $
 */
 class Event
 {
@@ -81,7 +81,7 @@ class Event
       VolumeDecrease, VolumeIncrease,
 
       UIUp, UIDown, UILeft, UIRight, UIHome, UIEnd, UIPgUp, UIPgDown,
-      UISelect, UINavPrev, UINavNext, UITabPrev, UITabNext, UIOK, UICancel,
+      UISelect, UINavPrev, UINavNext, UIOK, UICancel,
 
       LastType
     };
diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx
index 3ddb1c9b0..1606480e4 100644
--- a/stella/src/emucore/EventHandler.cxx
+++ b/stella/src/emucore/EventHandler.cxx
@@ -14,7 +14,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: EventHandler.cxx,v 1.198 2007-01-19 21:53:25 stephena Exp $
+// $Id: EventHandler.cxx,v 1.199 2007-01-24 21:36:38 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -2661,9 +2661,7 @@ EventHandler::ActionList EventHandler::ourMenuActionList[kMenuActionListSize] =
   { Event::UISelect,    "Select item",          0 },
 
   { Event::UINavPrev,   "Previous object",      0 },
-  { Event::UINavNext,   "Next object",          0 },
-  { Event::UITabPrev,   "Previous tabgroup",    0 },
-  { Event::UITabNext,   "Next tabgroup",        0 }
+  { Event::UINavNext,   "Next object",          0 }
 };
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/stella/src/emucore/EventHandler.hxx b/stella/src/emucore/EventHandler.hxx
index 1aa7cebf2..7622392f3 100644
--- a/stella/src/emucore/EventHandler.hxx
+++ b/stella/src/emucore/EventHandler.hxx
@@ -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: EventHandler.hxx,v 1.99 2007-01-13 15:55:14 stephena Exp $
+// $Id: EventHandler.hxx,v 1.100 2007-01-24 21:36:38 stephena Exp $
 //============================================================================
 
 #ifndef EVENTHANDLER_HXX
@@ -62,7 +62,7 @@ enum EventMode {
   mapping can take place.
 
   @author  Stephen Anthony
-  @version $Id: EventHandler.hxx,v 1.99 2007-01-13 15:55:14 stephena Exp $
+  @version $Id: EventHandler.hxx,v 1.100 2007-01-24 21:36:38 stephena Exp $
 */
 class EventHandler
 {
@@ -466,7 +466,7 @@ class EventHandler
   private:
     enum {
       kEmulActionListSize = 80,
-      kMenuActionListSize = 15
+      kMenuActionListSize = 13
     };
 
     // Structure used for action menu items
diff --git a/stella/src/gp2x/OSystemGP2X.cxx b/stella/src/gp2x/OSystemGP2X.cxx
index 789b32cea..6ba231588 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.25 2007-01-01 18:04:51 stephena Exp $
+// $Id: OSystemGP2X.cxx,v 1.26 2007-01-24 21:36:38 stephena Exp $
 // Modified on 2006/01/06 by Alex Zaballa for use on GP2X
 //============================================================================
 
@@ -115,9 +115,9 @@ 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::UITabPrev, kMenuMode, 0, 12);		// A
+//  myEventHandler->setDefaultJoyMapping(Event::UITabPrev, kMenuMode, 0, 12);		// A
   myEventHandler->setDefaultJoyMapping(Event::UISelect, kMenuMode, 0, 13);		// B
-  myEventHandler->setDefaultJoyMapping(Event::UITabNext, kMenuMode, 0, 14);             // 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-
diff --git a/stella/src/gui/Dialog.cxx b/stella/src/gui/Dialog.cxx
index fe46e6e78..2423977d2 100644
--- a/stella/src/gui/Dialog.cxx
+++ b/stella/src/gui/Dialog.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: Dialog.cxx,v 1.54 2007-01-24 19:17:33 stephena Exp $
+// $Id: Dialog.cxx,v 1.55 2007-01-24 21:36:38 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -319,10 +319,16 @@ void Dialog::handleKeyDown(int ascii, int keycode, int modifiers)
   // not ascii??
   if(instance()->eventHandler().kbdShift(modifiers))
   {
-    if(ascii == 256+20)       // left arrow
-      e = Event::UITabPrev;
-    else if(ascii == 256+19)  // right arrow
-      e = Event::UITabNext;
+    if(ascii == 256+20 && _ourTab)      // left arrow
+    {
+      _ourTab->cycleTab(-1);
+      return;
+    }
+    else if(ascii == 256+19 && _ourTab) // right arrow
+    {
+      _ourTab->cycleTab(+1);
+      return;
+    }
     else if(keycode == 9)     // tab
       e = Event::UINavPrev;
   }
@@ -468,22 +474,6 @@ bool Dialog::handleNavEvent(Event::Type e)
 {
   switch(e)
   {
-    case Event::UITabPrev:
-      if(_ourTab)
-      {
-        _ourTab->cycleTab(-1);
-        return true;
-      }
-      break;
-
-    case Event::UITabNext:
-      if(_ourTab)
-      {
-        _ourTab->cycleTab(+1);
-        return true;
-      }
-      break;
-
     case Event::UINavPrev:
       if(_focusedWidget && !_focusedWidget->wantsTab())
       {