diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
index b235b1b1744..afefc1a5972 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
@@ -546,7 +546,8 @@ public class CDocumentProvider extends TextFileDocumentProvider {
 		private void setOverlay(Object value, ProblemAnnotation problemAnnotation) {
 			if (value instanceof CMarkerAnnotation) {
 				CMarkerAnnotation annotation= (CMarkerAnnotation) value;
-				if (annotation.isProblem() && !annotation.isQuickFixable()) {
+				if (annotation.isProblem()
+						&& (!annotation.isQuickFixableStateSet() || !annotation.isQuickFixable())) {
 					annotation.setOverlay(problemAnnotation);
 					fPreviouslyOverlaid.remove(annotation);
 					fCurrentlyOverlaid.add(annotation);