diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/AndroidGamepadManager.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/AndroidGamepadManager.java
index 70157d86dcf0..6b5d743e8695 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/AndroidGamepadManager.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/AndroidGamepadManager.java
@@ -407,7 +407,10 @@ public class AndroidGamepadManager {
                 public void onInputDeviceChanged(int deviceId) {
                 }
             };
-            ((InputManager) GeckoAppShell.getContext().getSystemService(Context.INPUT_SERVICE)).registerInputDeviceListener(sListener, ThreadUtils.getUiHandler());
+            final InputManager im = (InputManager)
+                    GeckoAppShell.getApplicationContext()
+                                 .getSystemService(Context.INPUT_SERVICE);
+            im.registerInputDeviceListener(sListener, ThreadUtils.getUiHandler());
         }
     }
 
@@ -418,7 +421,10 @@ public class AndroidGamepadManager {
                 sPollTimer = null;
             }
         } else {
-            ((InputManager) GeckoAppShell.getContext().getSystemService(Context.INPUT_SERVICE)).unregisterInputDeviceListener(sListener);
+            final InputManager im = (InputManager)
+                    GeckoAppShell.getApplicationContext()
+                                 .getSystemService(Context.INPUT_SERVICE);
+            im.unregisterInputDeviceListener(sListener);
             sListener = null;
         }
     }