diff --git a/js/id/modes/move_way.js b/js/id/modes/move_way.js
index 30c473406..986eef5bd 100644
--- a/js/id/modes/move_way.js
+++ b/js/id/modes/move_way.js
@@ -47,7 +47,7 @@ iD.modes.MoveWay = function(context, wayId) {
             context.enter(iD.modes.Browse(context));
         }
 
-        context.selection()
+        context.surface()
             .on('mousemove.move-way', move)
             .on('click.move-way', finish);
 
@@ -63,7 +63,7 @@ iD.modes.MoveWay = function(context, wayId) {
     };
 
     mode.exit = function() {
-        context.selection()
+        context.surface()
             .on('mousemove.move-way', null)
             .on('click.move-way', null);