diff --git a/modules/modes/select.js b/modules/modes/select.js
index e8d8a9046..6e4fde38c 100644
--- a/modules/modes/select.js
+++ b/modules/modes/select.js
@@ -256,7 +256,11 @@ export function modeSelect(context, selectedIDs) {
             .on('redone.select', checkSelectedIDs);
 
         context.map()
-            .on('drawn.select', selectElements)
+            .on('drawn.select', function(info) {
+                if (info.full !== false) {
+                    selectElements();
+                }
+            })
             .on('crossEditableZoom.select', function() {
                 selectElements();
                 _breatheBehavior.restartIfNeeded(context.surface());
@@ -343,7 +347,6 @@ export function modeSelect(context, selectedIDs) {
             surface.selectAll('.related')
                 .classed('related', false);
 
-            singularParent();
             if (_relatedParent) {
                 surface.selectAll(utilEntitySelector([_relatedParent]))
                     .classed('related', true);