diff --git a/src/components/hand-controls2.js b/src/components/hand-controls2.js
index af86cd5da272ea5aee5c60e75578da84a13aaef5..f3ce63691922b923a8a750a532a07a9c973c5bef 100644
--- a/src/components/hand-controls2.js
+++ b/src/components/hand-controls2.js
@@ -18,6 +18,11 @@ const CONTROLLER_OFFSETS = {
     new THREE.Quaternion().setFromEuler(new THREE.Euler(-40 * THREE.Math.DEG2RAD, 0, 0)),
     new THREE.Vector3(1, 1, 1)
   ),
+  "windows-motion-controls": new THREE.Matrix4().compose(
+    new THREE.Vector3(0, -0.017, 0.13),
+    new THREE.Quaternion().setFromEuler(new THREE.Euler(-40 * THREE.Math.DEG2RAD, 0, 0)),
+    new THREE.Vector3(1, 1, 1)
+  ),
   "daydream-controls": new THREE.Matrix4().makeTranslation(0, 0, -0.04),
   "gearvr-controls": new THREE.Matrix4()
 };
diff --git a/src/input-mappings.js b/src/input-mappings.js
index a5c399937f0af8d129e2a177a5175bfeeb27efbd..36a1fdb0ed6586eff46b1e397e3b5b9b973df28b 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -26,6 +26,9 @@ const config = {
       "vive-controls": {
         trackpad: "trackpad_dpad4"
       },
+      "windows-motion-controls": {
+        joystick: "joystick_dpad4"
+      },
       "daydream-controls": {
         trackpad: "trackpad_dpad4"
       },
@@ -80,6 +83,28 @@ const config = {
         abuttondown: "action_primary_down",
         abuttonup: "action_primary_up"
       },
+      "windows-motion-controls": {
+        joystick_dpad4_west: {
+          right: "snap_rotate_left"
+        },
+        joystick_dpad4_east: {
+          right: "snap_rotate_right"
+        },
+        "trackpad.pressedmove": { left: "move" },
+        joystick_dpad4_pressed_west_down: { right: "snap_rotate_left" },
+        joystick_dpad4_pressed_east_down: { right: "snap_rotate_right" },
+        trackpaddown: {right: "action_primary_down"},
+        trackpadup: { right: "action_primary_up" },
+        menudown: "thumb_down",
+        menuup: "thumb_up",
+        gripdown: ["action_grab", "middle_ring_pinky_down"],
+        gripup: ["action_release", "middle_ring_pinky_up"],
+        trackpadtouchstart: "thumb_down",
+        trackpadtouchend: "thumb_up",
+        triggerdown: ["action_grab", "index_down"],
+        triggerup: ["action_release", "index_up"],
+        "axismove.reverseY": { left: "move" },
+      },
       "daydream-controls": {
         trackpad_dpad4_pressed_west_down: "snap_rotate_left",
         trackpad_dpad4_pressed_east_down: "snap_rotate_right",