1 files changed, 6 insertions, 0 deletions
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java
index 74eccaeb15..2271ff71f7 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java
@@ -767,6 +767,9 @@ public class GeckoView extends FrameLayout implements GeckoDisplay.NewSurfacePro
     if (super.onKeyUp(keyCode, event)) {
       return true;
     }
+    if (AndroidGamepadManager.handleKeyEvent(event)) {
+      return true;
+    }
     return mSession != null && mSession.getTextInput().onKeyUp(keyCode, event);
   }
 
@@ -775,6 +778,9 @@ public class GeckoView extends FrameLayout implements GeckoDisplay.NewSurfacePro
     if (super.onKeyDown(keyCode, event)) {
       return true;
     }
+    if (AndroidGamepadManager.handleKeyEvent(event)) {
+      return true;
+    }
     return mSession != null && mSession.getTextInput().onKeyDown(keyCode, event);
   }