diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
index 2bb0f80ef5c..6825718609a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
@@ -965,13 +965,15 @@ public class IncludeOrganizer {
 						break;
 					}
 				}
-				IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths);
-				if (header == null)
-					throw new OperationCanceledException();
-
-				request.resolve(header);
-				if (!fContext.isAlreadyIncluded(header))
-					fContext.addHeaderToInclude(header);
+				if (!request.isResolved()) {
+					IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths);
+					if (header == null)
+						throw new OperationCanceledException();
+	
+					request.resolve(header);
+					if (!fContext.isAlreadyIncluded(header))
+						fContext.addHeaderToInclude(header);
+				}
 			}
 		}
 	}