diff --git a/css/55_cursors.css b/css/55_cursors.css
index db5834e6d..9e72d7ddf 100644
--- a/css/55_cursors.css
+++ b/css/55_cursors.css
@@ -49,16 +49,6 @@
     cursor: url(img/cursor-select-remove.png), pointer; /* FF */
 }
 
-#map .point:active,
-#map .vertex:active,
-#map .line:active,
-#map .area:active,
-#map .midpoint:active,
-#map .mode-select .selected {
-    cursor: pointer; /* Opera */
-    cursor: url(img/cursor-select-acting.png), pointer; /* FF */
-}
-
 .mode-draw-line #map,
 .mode-draw-area #map,
 .mode-add-line  #map,
diff --git a/modules/behavior/draw_way.js b/modules/behavior/draw_way.js
index 68e56c182..18e270c7e 100644
--- a/modules/behavior/draw_way.js
+++ b/modules/behavior/draw_way.js
@@ -41,7 +41,7 @@ export function behaviorDrawWay(context, wayId, index, mode, startGraph) {
     function move(datum) {
         var loc;
         var target = datum && datum.id && context.hasEntity(datum.id);
-        if (target && target.type === 'node') {   // snap to node
+        if (datum.loc) {   // snap to node/vertex - a real entity or a nope target with a `loc`
             loc = datum.loc;
         } else if (target && target.type === 'way') {   // snap to way
             var choice = geoChooseEdge(
diff --git a/modules/modes/drag_node.js b/modules/modes/drag_node.js
index e76180f47..3759a1c3d 100644
--- a/modules/modes/drag_node.js
+++ b/modules/modes/drag_node.js
@@ -144,9 +144,9 @@ export function modeDragNode(context) {
             var d = datum();
             var target = d && d.id && context.hasEntity(d.id);
 
-            if (target && target.type === 'node') {
-                loc = target.loc;
-            } else if (target && target.type === 'way') {
+            if (d.loc) {    // snap to node/vertex - a real entity or a nope target with a `loc`
+                loc = d.loc;
+            } else if (target && target.type === 'way') {   // snap to way
                 var choice = geoChooseEdge(
                     context.childNodes(target), context.mouse(), context.projection, entity.id
                 );