diff --git a/js/id/behavior/draw_way.js b/js/id/behavior/draw_way.js
index 9efcd5bb9..f724613da 100644
--- a/js/id/behavior/draw_way.js
+++ b/js/id/behavior/draw_way.js
@@ -16,10 +16,13 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
     function move(datum) {
         var loc = context.map().mouseCoordinates();
 
-        if (datum.type === 'node' || datum.type === 'midpoint') {
+        if (datum.type === 'node') {
             loc = datum.loc;
-        } else if (datum.type === 'way') {
-            loc = iD.geo.chooseIndex(datum, d3.mouse(context.surface().node()), context).loc;
+        } else if (datum.type === 'midpoint' || datum.type === 'way') {
+            var way = datum.type === 'way' ?
+                datum :
+                baseGraph.entity(datum.ways[0].id);
+            loc = iD.geo.chooseIndex(way, d3.mouse(context.surface().node()), context).loc;
         }
 
         context.replace(iD.actions.MoveNode(nodeId, loc));