diff --git a/js/id/behavior/draw_way.js b/js/id/behavior/draw_way.js
index 6b648db0e..8c4c4a5cc 100644
--- a/js/id/behavior/draw_way.js
+++ b/js/id/behavior/draw_way.js
@@ -28,7 +28,13 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
     function move(datum) {
         var loc = context.map().mouseCoordinates();
 
-        if (datum.type === 'node') {
+        if (datum.id === end.id || datum.id === segment.id) {
+            context.surface().selectAll('.way, .node')
+                .filter(function (d) {
+                    return d.id === end.id || d.id === segment.id;
+                })
+                .classed('active', true);
+        } else if (datum.type === 'node') {
             loc = datum.loc;
         } else if (datum.type === 'way') {
             loc = iD.geo.chooseIndex(datum, d3.mouse(context.surface().node()), context).loc;