diff --git a/src/input/Gamepad.js b/src/input/Gamepad.js
index 018be4e88..593ded49f 100644
--- a/src/input/Gamepad.js
+++ b/src/input/Gamepad.js
@@ -252,6 +252,11 @@ Phaser.Gamepad.prototype = {
     */
     _pollGamepads: function () {
 
+        if (!this._active)
+        {
+            return;
+        }
+
         if (navigator['getGamepads'])
         {
             var rawGamepads = navigator.getGamepads();
@@ -291,6 +296,11 @@ Phaser.Gamepad.prototype = {
                 }
             }
 
+            for (var g = 0; g < this._gamepads.length; g++)
+            {
+                this._gamepads[g]._rawPad = this._rawPads[g];
+            }
+
             if (gamepadsChanged)
             {
                 var validConnections = { rawIndices: {}, padIndices: {} };