diff --git a/android/gradle_project/allegro/src/main/java/org/liballeg/android/KeyListener.java b/android/gradle_project/allegro/src/main/java/org/liballeg/android/KeyListener.java
index b832d35a81..bbc447e3ea 100644
--- a/android/gradle_project/allegro/src/main/java/org/liballeg/android/KeyListener.java
+++ b/android/gradle_project/allegro/src/main/java/org/liballeg/android/KeyListener.java
@@ -139,21 +139,17 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
       if (index >= 0) {
          code = getCode(keyCode, event, index);
       }
-      if (code == -1) {
-         return onKeyboardKey(v, keyCode, event);
-      }
-      else if (code == -2) {
-         return true;
-      }
-      if (event.getAction() == KeyEvent.ACTION_DOWN) {
-         if (event.getRepeatCount() == 0) {
-            nativeOnJoystickButton(index, code, true);
+      if (code >= 0) {
+         if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            if (event.getRepeatCount() == 0) {
+               nativeOnJoystickButton(index, code, true);
+            }
+         }
+         else {
+            nativeOnJoystickButton(index, code, false);
          }
       }
-      else {
-         nativeOnJoystickButton(index, code, false);
-      }
-      return true;
+      return onKeyboardKey(v, keyCode, event);
    }
 
    private void volumeChange(int inc)