diff --git a/src/components/debug-controller.js b/src/components/debug-controller.js
index 414621f..09d908e 100644
--- a/src/components/debug-controller.js
+++ b/src/components/debug-controller.js
@@ -30,6 +30,9 @@ AFRAME.registerComponent('debug-controller', {
       secondaryHand.setAttribute('controller', 'controllerType', 'vive-controls');
     }
 
+    // Enable raycaster.
+    this.el.emit('enter-vr', null, false);
+
     document.addEventListener('keydown', evt => {
       var primaryPosition;
       var primaryRotation;
diff --git a/src/index.html b/src/index.html
index e73f154..646e576 100644
--- a/src/index.html
+++ b/src/index.html
@@ -63,9 +63,9 @@
         {% macro saber (hand, otherHand, color) %}
           <a-entity id="{{ hand }}Hand"
             mixin="raycaster"
-            bind__hand-swapper="enabled: menu.active && activeHand === '{{ otherHand }}'"
+            bind__hand-swapper="enabled: {{ otherHand }}RaycasterActive"
             bind__pauser="enabled: !menu.active"
-            bind__raycaster="enabled: menu.active && activeHand === '{{ hand }}'; showLine: menu.active && activeHand === '{{ hand }}'"
+            bind__raycaster="enabled: {{ hand }}RaycasterActive; showLine: {{ hand }}RaycasterActive"
             bind__saber-controls="bladeEnabled: !menu.active"
             cursor
             saber-controls="hand: {{ hand }}"
diff --git a/src/state/index.js b/src/state/index.js
index 45d5581..29c7a07 100644
--- a/src/state/index.js
+++ b/src/state/index.js
@@ -164,7 +164,12 @@ AFRAME.registerState({
   /**
    * Post-process the state after each action.
    */
-  // computeState: (state) => { }
+  computeState: (state) => {
+    state.leftRaycasterActive = state.menu.active && state.activeHand === 'left' &&
+                                state.inVR;
+    state.rightRaycasterActive = state.menu.active && state.activeHand === 'right' &&
+                                 state.inVR;
+  }
 });
 
 function computeSearchPagination (state) {