diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
index 3f9a7b5caff..ecf2bf200f8 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
@@ -1033,7 +1033,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
 
 		@Override
 		public IStatus runInWorkspace(IProgressMonitor monitor) {								
-			while (markerProblems.peek() != null) {
+			while (markerProblems.peek() != null && !monitor.isCanceled()) {
 				PathEntryProblem problem = markerProblems.poll();
 				IProject project = problem.project;
 				ICModelStatus[] problems = problem.problems;