diff --git a/js/id/ui/map_data.js b/js/id/ui/map_data.js
index 16d308ad2..1fd7fb64c 100644
--- a/js/id/ui/map_data.js
+++ b/js/id/ui/map_data.js
@@ -8,7 +8,7 @@ iD.ui.MapData = function(context) {
     function map_data(selection) {
 
         function showsFeature(d) {
-            return autoHiddenFeature(d) ? null : !context.features().hidden(d);
+            return autoHiddenFeature(d) ? null : context.features().enabled(d);
         }
 
         function autoHiddenFeature(d) {
@@ -88,7 +88,6 @@ iD.ui.MapData = function(context) {
             if (name === 'feature') {
                 items
                     .selectAll('input')
-                    .property('disabled', autoHiddenFeature)
                     .property('indeterminate', autoHiddenFeature);
             }