diff --git a/package.json b/package.json
index f41edd0f8f57c00f212c3ec3cb651de5359a37b6..190ff318264873ec03c11b0744566b2ac1935502 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "aframe-billboard-component": "^1.0.0",
-    "aframe-input-mapping-component": "https://github.com/johnshaughnessy/aframe-input-mapping-component#23e2855",
+    "aframe-input-mapping-component": "https://github.com/johnshaughnessy/aframe-input-mapping-component#feature/map-to-array",
     "aframe-teleport-controls": "https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin",
     "aframe-xr": "github:brianpeiris/aframe-xr#3162aed",
     "material-design-lite": "^1.3.0",
diff --git a/src/input-mappings.js b/src/input-mappings.js
index 622ee302f0d21d896c57650db2cefa076acef0f8..b5b564b25fe0486918e82c81118ebf08ba8e91bf 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -56,11 +56,8 @@ const config = {
         surfacetouchend: "thumb_up",
         thumbsticktouchstart: "thumb_down",
         thumbsticktouchend: "thumb_up",
-        triggerdown: "index_down",
-        triggerup: "index_up",
-        // @TODO: Patch AFIM to allow more than one action to be mapped to triggerdown
-        //triggerdown: "action_teleport_down",
-        //triggerup: "action_teleport_up",
+        triggerdown: ["action_teleport_down", "index_down"],
+        triggerup: ["action_teleport_up", "index_up"],
         "axismove.reverseY": { left: "move" },
         right_dpad_east: "snap_rotate_right",
         right_dpad_west: "snap_rotate_left",
diff --git a/yarn.lock b/yarn.lock
index 2a61bbb4cf790fbe2d153dd25727ed0fa7fdaddc..7284e9761b90246d2c0f0981f68334d756cc9de6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -44,9 +44,9 @@ aframe-billboard-component@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/aframe-billboard-component/-/aframe-billboard-component-1.0.0.tgz#10ce2482729eef7386c5844d65917581a62d3adc"
 
-"aframe-input-mapping-component@https://github.com/johnshaughnessy/aframe-input-mapping-component#23e2855":
+"aframe-input-mapping-component@https://github.com/johnshaughnessy/aframe-input-mapping-component#feature/map-to-array":
   version "0.1.2"
-  resolved "https://github.com/johnshaughnessy/aframe-input-mapping-component#23e2855"
+  resolved "https://github.com/johnshaughnessy/aframe-input-mapping-component#4c7e493ad6c4a25eef27d32551c94d8b78541191"
 
 aframe-lerp-component@^1.1.0:
   version "1.1.0"