diff --git a/apps/plugins/xworld/keymaps.h b/apps/plugins/xworld/keymaps.h
index 78d93604a8..27a6be9bf0 100644
--- a/apps/plugins/xworld/keymaps.h
+++ b/apps/plugins/xworld/keymaps.h
@@ -148,7 +148,7 @@
 #elif (CONFIG_KEYPAD == MROBE500_PAD)
 #define BTN_FIRE      BUTTON_POWER
 
-#elif (CONFIG_KEYPAD ==  MROBE_REMOTE)
+#elif (CONFIG_KEYPAD == MROBE_REMOTE)
 #define BTN_UP         BUTTON_RC_PLAY
 #define BTN_DOWN       BUTTON_RC_DOWN
 #define BTN_LEFT       BUTTON_RC_REW
@@ -192,9 +192,9 @@
     (CONFIG_KEYPAD == ONDAVX777_PAD)
 #define BTN_PAUSE      BUTTON_BOTTOMLEFT
 
-#elif (CONFIG_KEYPAD == !COWON_D2_PAD) || \
-      (CONFIG_KEYPAD != !DX50_PAD)     || \
-      (CONFIG_KEYMAP != ONDAVX777_PAD)
+#elif (CONFIG_KEYPAD != COWON_D2_PAD) && \
+      (CONFIG_KEYPAD != DX50_PAD)     && \
+      (CONFIG_KEYPAD != ONDAVX777_PAD)
 #define BTN_FIRE       BUTTON_BOTTOMLEFT
 #define BTN_PAUSE      BUTTON_TOPLEFT
 #endif