diff --git a/js/id/renderer/features.js b/js/id/renderer/features.js
index 005382eaa..a9fddb499 100644
--- a/js/id/renderer/features.js
+++ b/js/id/renderer/features.js
@@ -238,6 +238,11 @@ iD.Features = function(context) {
         }
     };
 
+    features.resetStats = function() {
+        _.each(feature, function(f) { f.count = 0; });
+        dispatch.change();
+    };
+
     features.gatherStats = function(d, resolver, dimensions) {
         var needsRedraw = false,
             currHidden;
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 016b896ce..2b9eff547 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -138,11 +138,14 @@ iD.Map = function(context) {
 
     function editOff() {
         var mode = context.mode();
+
+        context.features().resetStats();
         surface.selectAll('.layer *').remove();
-        dispatch.drawn({full: true});
         if (!(mode && mode.id === 'browse')) {
             context.enter(iD.modes.Browse(context));
         }
+
+        dispatch.drawn({full: true});
     }
 
     function zoomPan() {