diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesCommand.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesCommand.cs
index 505eebfa84..462a225070 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesCommand.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesCommand.cs
@@ -226,7 +226,7 @@ namespace CSharpBinding.Refactoring
 				cancellationToken.ThrowIfCancellationRequested();
 				var issues = provider.GetIssues(context).ToList();
 				// Fix issues, if possible:
-				if (issues.Any(i => i.Actions.Count > 0)) {
+				if (provider.Attribute.SupportsAutoFix && issues.Any(i => i.Actions.Count > 0)) {
 					using (var script = context.StartScript()) {
 						foreach (var issue in issues) {
 							if (issue.Actions.Count > 0) {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/IssueAttribute.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/IssueAttribute.cs
index 2d97900196..0a72c4728b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/IssueAttribute.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/IssueAttribute.cs
@@ -41,6 +41,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		public string SuppressMessageCheckId { get; set; }
 		public int PragmaWarning { get; set; }
 		public bool IsEnabledByDefault { get; set; }
+		public bool SupportsAutoFix { get; set; }
 
 		public Severity Severity { get; set; }