diff --git a/src/engine.c b/src/engine.c
index 8e991b77..c7fe2fb2 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -53,6 +53,11 @@
 #include "pxsimple.h"
 #include "oldies.h"
 
+#if defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__)
+// We don't want to underline the keyboard shortcuts as there is no keyboard
+#define NO_KEYBOARD
+#endif
+
 
 // we need this as global
 short Old_MX = -1;
@@ -1881,9 +1886,13 @@ void Window_draw_normal_bouton(word x_pos,word y_pos,word width,word height,
   text_y_pos=y_pos+((height-7)>>1);
   Print_in_window(text_x_pos,text_y_pos,title,title_color,MC_Light);
 
+#if !defined(NO_KEYBOARD)
   if (undersc_letter)
     Window_rectangle(text_x_pos+((undersc_letter-1)<<3),
           text_y_pos+8,8,1,MC_Dark);
+#else
+  (void)undersc_letter;
+#endif
 }
 
 
diff --git a/src/windows.c b/src/windows.c
index 8ab79fa8..c967622f 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -61,6 +61,11 @@
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
 
+#if defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__)
+// We don't want to underline the keyboard shortcuts as there is no keyboard
+#define NO_KEYBOARD
+#endif
+
 T_Toolbar_button Buttons_Pool[NB_BUTTONS];
 T_Menu_Bar Menu_bars[MENUBAR_COUNT] =
   {{MENU_WIDTH,  9, 1, 45, {NULL,NULL,NULL},  20, BUTTON_HIDE }, // Status
@@ -994,9 +999,12 @@ void Print_in_window_underscore(short x,short y,const char * str,byte text_color
     Print_char_in_window(x,y,*p++,text_color,background_color);
     x+=8;
   }
-  if (undersc_letter) {
+#if !defined(NO_KEYBOARD)
+  if (undersc_letter)
     Window_rectangle(x_pos+((undersc_letter-1)<<3),y+8,8,1,text_color);
-  }
+#else
+  (void)undersc_letter;
+#endif
   Update_window_area(x_pos,y,x-x_pos,8);
 }