diff --git a/js/id/modes/select.js b/js/id/modes/select.js
index 04ee6db7d..de5d4ffe2 100644
--- a/js/id/modes/select.js
+++ b/js/id/modes/select.js
@@ -131,10 +131,15 @@ iD.modes.Select = function(context, selection, initial) {
         d3.select(document)
             .call(keybinding);
 
-        context.surface()
-            .selectAll("*")
-            .filter(selected)
-            .classed('selected', true);
+        function selectElements() {
+            context.surface()
+                .selectAll("*")
+                .filter(selected)
+                .classed('selected', true);
+        }
+
+        context.map().on('drawn.select', selectElements);
+        selectElements();
 
         radialMenu = iD.ui.RadialMenu(operations);
         var show = d3.event && !initial;
@@ -176,6 +181,8 @@ iD.modes.Select = function(context, selection, initial) {
             .on('dblclick.select', null)
             .selectAll(".selected")
             .classed('selected', false);
+
+        context.map().on('drawn.select', null);
     };
 
     return mode;