diff --git a/scripts/system/mod.js b/scripts/system/mod.js
index 1a7b3b401e..ea9355e376 100644
--- a/scripts/system/mod.js
+++ b/scripts/system/mod.js
@@ -193,7 +193,7 @@ var triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');
 function controllerComputePickRay(hand) {
     var controllerPose = getControllerWorldLocation(hand, true);
     if (controllerPose.valid) {
-        return { origin: controllerPose.position, direction: controllerPose.orientation };
+        return { origin: controllerPose.position, direction: Quat.getUp(controllerPose.orientation) };
     }
 }