diff --git a/js/id/ui/commit.js b/js/id/ui/commit.js
index f47575c58..efdc1c190 100644
--- a/js/id/ui/commit.js
+++ b/js/id/ui/commit.js
@@ -108,7 +108,9 @@ iD.ui.Commit = function(context) {
             .enter()
             .append('li');
 
-        warningLi.append('button')
+        // only show the fix icon when an entity is given
+        warningLi.filter(function(d) { return d.entity; })
+            .append('button')
             .attr('class', 'minor')
             .on('click', event.fix)
             .append('span')
diff --git a/js/id/validate.js b/js/id/validate.js
index dacff7889..30568f652 100644
--- a/js/id/validate.js
+++ b/js/id/validate.js
@@ -15,6 +15,12 @@ iD.validate = function(changes, graph) {
         if (tags.building && tags.building === 'yes') return 'building=yes';
     }
 
+    if (changes.deleted.length > 100) {
+        warnings.push({
+            message: t('validations.many_deletions', { n: changes.deleted.length })
+        });
+    }
+
     for (var i = 0; i < changes.created.length; i++) {
         change = changes.created[i];
 
diff --git a/locale/en.js b/locale/en.js
index 2890187e2..0ba305dc0 100644
--- a/locale/en.js
+++ b/locale/en.js
@@ -221,6 +221,7 @@ locale.en = {
         untagged_point: "Untagged point which is not part of a line or area",
         untagged_line: "Untagged line",
         untagged_area: "Untagged area",
+        many_deletions: "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
         tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area",
         deprecated_tags: "Deprecated tags: {tags}"
     },