diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index 52a8dd349..d72f23596 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -175,8 +175,9 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
       setDefaultKey( KBDK_RETURN,    Event::UISelect  );
       setDefaultKey( KBDK_ESCAPE,    Event::UICancel  );
 
-      setDefaultKey( KBDK_BACKSPACE, Event::UIPrevDir );
-//#ifdef RETRON77 // debugging only, FIX ME!
+//#ifndef RETRON77 // debugging only, FIX ME!
+//      setDefaultKey(KBDK_BACKSPACE, Event::UIPrevDir);
+//#else
       setDefaultKey( KBDK_F9,        Event::UIUp );
       setDefaultKey( KBDK_F2,        Event::UIDown );
       setDefaultKey( KBDK_F11,       Event::UINavPrev );
diff --git a/src/gui/GlobalPropsDialog.cxx b/src/gui/GlobalPropsDialog.cxx
index 8da842b98..77bcf34ae 100644
--- a/src/gui/GlobalPropsDialog.cxx
+++ b/src/gui/GlobalPropsDialog.cxx
@@ -177,8 +177,12 @@ int GlobalPropsDialog::addHoldWidgets(const GUI::Font& font, int x, int y,
   ypos += myHoldSelect->getHeight() + VGAP;
   myHoldReset = new CheckboxWidget(this, font, xpos, ypos, "Reset");
 
+  const int TAB_ORDER[10] = {
+    kJ0Up, kJ0Left, kJ0Right, kJ0Down, kJ0Fire,
+    kJ1Up, kJ1Left, kJ1Right, kJ1Down, kJ1Fire
+  };
   for(int i = kJ0Up; i <= kJ1Fire; ++i)
-    wid.push_back(myJoy[i]);
+    wid.push_back(myJoy[TAB_ORDER[i]]);
 
   wid.push_back(myHoldSelect);
   wid.push_back(myHoldReset);