diff --git a/xwords4/palm/common.rcp.pre b/xwords4/palm/common.rcp.pre
index 137084ae7..d58e372a8 100644
--- a/xwords4/palm/common.rcp.pre
+++ b/xwords4/palm/common.rcp.pre
@@ -131,6 +131,22 @@ BEGIN
 #endif
 END /* XW_MAIN_FORM */
 
+#ifdef XWFEATURE_FIVEWAY
+NAVIGATION ID XW_MAIN_FORM
+INITIALSTATE kFrmNavHeaderFlagsObjectFocusStartState
+INITIALOBJECTID XW_MAIN_FLIP_BUTTON_ID
+BEGIN
+    ID XW_MAIN_FLIP_BUTTON_ID 
+    ID XW_MAIN_VALUE_BUTTON_ID 
+    ID XW_MAIN_HINT_BUTTON_ID 
+    ID XW_MAIN_SHOWTRAY_BUTTON_ID
+    ID XW_MAIN_HIDE_BUTTON_ID
+    ID XW_MAIN_JUGGLE_BUTTON_ID
+    ID XW_MAIN_TRADE_BUTTON_ID
+    ID XW_MAIN_DONE_BUTTON_ID
+END
+#endif
+
 STRING ID 1000 "/palm/programs/Crosswords/"
 
 APPLICATIONICONNAME ID 1000 ICONTEXT
diff --git a/xwords4/palm/palmmain.c b/xwords4/palm/palmmain.c
index fa10866ac..cba8fb4da 100644
--- a/xwords4/palm/palmmain.c
+++ b/xwords4/palm/palmmain.c
@@ -2462,13 +2462,15 @@ mainViewHandleEvent( EventPtr event )
             if ( ch < 255 && ch > ' ' ) {
                 draw = board_handleKey( globals->game.board, ch );
                 if ( !draw && ch >= 'a' ) {
-                    draw = board_handleKey( globals->game.board, ch - ('a' - 'A') );
+                    draw = board_handleKey( globals->game.board, 
+                                            ch - ('a' - 'A') );
                 }
             }
         }
         if ( xpkey != XP_KEY_NONE ) {
             draw = board_handleKey( globals->game.board, xpkey );
         }
+        handled = draw;
     }
         break;