diff --git a/js/id/modes/drag_node.js b/js/id/modes/drag_node.js
index 748ad4998..ca9d27142 100644
--- a/js/id/modes/drag_node.js
+++ b/js/id/modes/drag_node.js
@@ -139,9 +139,13 @@ iD.modes.DragNode = function(context) {
 
         var parentWays = _.pluck(context.graph().parentWays(entity), 'id');
 
-        context.enter(
-            iD.modes.Select(context, parentWays)
-                .suppressMenu(true));
+        if (parentWays.length) {
+            context.enter(
+                iD.modes.Select(context, parentWays)
+                    .suppressMenu(true));
+        } else {
+            context.enter(iD.modes.Browse(context));
+        }
     }
 
     function cancel() {