diff --git a/js/id/id.js b/js/id/id.js
index c18241094..ece51e17a 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -17,7 +17,7 @@ window.iD = function () {
     };
 
     var history = iD.History(context),
-        dispatch = d3.dispatch('enter', 'exit', 'select', 'toggleFullscreen'),
+        dispatch = d3.dispatch('enter', 'exit', 'toggleFullscreen'),
         mode,
         container,
         ui = iD.ui(context),
@@ -100,8 +100,6 @@ window.iD = function () {
 
     /* Modes */
     context.enter = function(newMode) {
-        var s0 = context.selectedIDs();
-
         if (mode) {
             mode.exit();
             dispatch.exit(mode);
@@ -110,9 +108,6 @@ window.iD = function () {
         mode = newMode;
         mode.enter();
         dispatch.enter(mode);
-
-        var s1 = context.selectedIDs();
-        dispatch.select(s1, s0);
     };
 
     context.mode = function() {
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 9a6b7a224..7f0a2fa15 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -75,7 +75,7 @@ iD.Map = function(context) {
             }
         });
 
-        context.on('select.map', function() {
+        context.on('enter.map', function() {
             if (map.editable() && !transformed) {
                 var all = context.intersects(map.extent()),
                     filter = d3.functor(true),