diff --git a/modules/modes/drag_node.js b/modules/modes/drag_node.js
index 391f9ab0a..a36402908 100644
--- a/modules/modes/drag_node.js
+++ b/modules/modes/drag_node.js
@@ -97,10 +97,14 @@ export function modeDragNode(context) {
             var vertex = context.surface().selectAll('.' + entity.id);
             behavior.target(vertex.node(), entity);
 
+            activeIDs = _.map(context.graph().parentWays(entity), 'id');
+            activeIDs.push(entity.id);
+
         } else {
             context.perform(actionNoop());
         }
 
+        setActiveElements();
         context.enter(mode);
     }