diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index aa6aa0489c..6a9050381f 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -1057,11 +1057,12 @@ static void handle_hotplug(android_input_t *android,
     * This device is composed of two hid devices
     * We make it look like one device
     */
-   else if(strstr(device_model, "R800") &&
-         (
-          strstr(device_name, "keypad-game-zeus") ||
-          strstr(device_name, "keypad-zeus")
-         )
+   else if((strstr(device_model, "R800") || strstr(device_model, "Xperia Play")) && 
+            (
+               strstr(device_name, "keypad-game-zeus") ||
+               strstr(device_name, "keypad-zeus") ||
+               strstr(device_name, "Android Gamepad")
+            )
          )
    {
       /* only use the hack if the device is one of the built-in devices */