diff --git a/apps/plugins/xworld/keymaps.h b/apps/plugins/xworld/keymaps.h
index ef32e59974..6456ab1ede 100644
--- a/apps/plugins/xworld/keymaps.h
+++ b/apps/plugins/xworld/keymaps.h
@@ -51,8 +51,6 @@
 #define BTN_LEFT       BUTTON_LEFT
 #define BTN_RIGHT      BUTTON_RIGHT
 
-#elif (CONFIG_KEYPAD == ONDAVX747_PAD)
-
 #if (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)
 #define BTN_UP_LEFT    BUTTON_BACK
 #define BTN_UP_RIGHT   BUTTON_PLAYPAUSE
@@ -171,6 +169,12 @@
 #define BTN_FIRE       BUTTON_PLUS
 #define BTN_PAUSE      BUTTON_MINUS
 
+#elif (CONFIG_KEYPAD == ONDAVX747_PAD)
+#define BTN_LEFT       BUTTON_LEFT
+#define BTN_RIGHT      BUTTON_RIGHT
+#define BTN_FIRE       BUTTON_BOTTOMLEFT
+#define BTN_PAUSE      BUTTON_TOPLEFT
+
 #else
 #error Unsupported keypad
 #endif