diff --git a/data/core.yaml b/data/core.yaml
index c087bf79a..77c5d5a27 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1290,9 +1290,9 @@ en:
         none: Detected issues will appear here
         elsewhere: "Issues elsewhere: {count}"
         other_features: "Issues with other features: {count}"
-        other_features_elsewhere: "Issues with other features elsewhere: {count}"
+        other_features_elsewhere: "Issues elsewhere with other features: {count}"
         disabled_rules: "Issues with disabled rules: {count}"
-        disabled_rules_elsewhere: "Issues with disabled rules elsewhere: {count}"
+        disabled_rules_elsewhere: "Issues elsewhere with disabled rules: {count}"
         ignored_issues: "Ignored issues: {count}"
         ignored_issues_elsewhere: "Ignored issues elsewhere: {count}"
     options:
diff --git a/dist/locales/en.json b/dist/locales/en.json
index dedf6df63..1a28e5652 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1581,9 +1581,9 @@
                     "none": "Detected issues will appear here",
                     "elsewhere": "Issues elsewhere: {count}",
                     "other_features": "Issues with other features: {count}",
-                    "other_features_elsewhere": "Issues with other features elsewhere: {count}",
+                    "other_features_elsewhere": "Issues elsewhere with other features: {count}",
                     "disabled_rules": "Issues with disabled rules: {count}",
-                    "disabled_rules_elsewhere": "Issues with disabled rules elsewhere: {count}",
+                    "disabled_rules_elsewhere": "Issues elsewhere with disabled rules: {count}",
                     "ignored_issues": "Ignored issues: {count}",
                     "ignored_issues_elsewhere": "Ignored issues elsewhere: {count}"
                 }
diff --git a/modules/core/validator.js b/modules/core/validator.js
index 2c32486a8..5beb5ff0b 100644
--- a/modules/core/validator.js
+++ b/modules/core/validator.js
@@ -221,7 +221,8 @@ export function coreValidator(context) {
 
             var detected = fn(entity, context);
             detected.forEach(function(issue) {
-                if (issue.severity === 'warning') {
+                var hasIgnoreFix = issue.fixes && issue.fixes.length && issue.fixes[issue.fixes.length - 1].type === 'ignore';
+                if (issue.severity === 'warning' && !hasIgnoreFix) {
                     var ignoreFix = new validationIssueFix({
                         title: t('issues.fix.ignore_issue.title'),
                         icon: 'iD-icon-close',
@@ -229,6 +230,7 @@ export function coreValidator(context) {
                             ignoreIssue(this.issue.id);
                         }
                     });
+                    ignoreFix.type = 'ignore';
                     ignoreFix.issue = issue;
                     issue.fixes.push(ignoreFix);
                 }