diff --git a/scripts/vr-edit/vr-edit.js b/scripts/vr-edit/vr-edit.js
index a760412658..cc22d20528 100644
--- a/scripts/vr-edit/vr-edit.js
+++ b/scripts/vr-edit/vr-edit.js
@@ -657,7 +657,7 @@
             selection.select(intersectedEntityID);
             if (toolSelected !== TOOL_SCALE || !otherEditor.isEditing(rootEntityID)) {
                 highlights.display(intersection.handIntersected, selection.selection(),
-                    toolSelected === TOOL_COLOR ? selection.intersectedEntityIndex() : null,
+                    toolSelected === TOOL_COLOR || toolSelected === TOOL_PICK_COLOR ? selection.intersectedEntityIndex() : null,
                     toolSelected === TOOL_SCALE || otherEditor.isEditing(rootEntityID)
                         ? highlights.SCALE_COLOR : highlights.HIGHLIGHT_COLOR);
             }
@@ -669,7 +669,7 @@
             selection.select(intersectedEntityID);
             if (toolSelected !== TOOL_SCALE || !otherEditor.isEditing(rootEntityID)) {
                 highlights.display(intersection.handIntersected, selection.selection(),
-                    toolSelected === TOOL_COLOR ? selection.intersectedEntityIndex() : null,
+                    toolSelected === TOOL_COLOR || toolSelected === TOOL_PICK_COLOR ? selection.intersectedEntityIndex() : null,
                     toolSelected === TOOL_SCALE || otherEditor.isEditing(rootEntityID)
                         ? highlights.SCALE_COLOR : highlights.HIGHLIGHT_COLOR);
             } else {