diff --git a/js/id/behavior/draw_way.js b/js/id/behavior/draw_way.js
index 1cc52ab1f..a0a6aa308 100644
--- a/js/id/behavior/draw_way.js
+++ b/js/id/behavior/draw_way.js
@@ -17,7 +17,13 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
         var loc = context.map().mouseCoordinates();
 
         if (datum.type === 'node') {
-            loc = datum.loc;
+            if (datum.id === nodeId) {
+                context.surface().selectAll('.way, .node')
+                    .filter(function (d) { return d.id === nodeId; })
+                    .classed('active', true);
+            } else {
+                loc = datum.loc;
+            }
         } else if (datum.type === 'midpoint' || datum.type === 'way') {
             var way = datum.type === 'way' ?
                 datum :