diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index c7c068a0b2a..8ff609c451c 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-10 Alain Magloire
+
+	* src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
+
 2004-08-06 Chris Wiebe
 
 	Add scheduling rule to WorkbenchRunnableAdapter
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
index bc1c4d0c7ad..c8df4177b68 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
@@ -116,7 +116,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate {
 
 	}
 	
-	private ITranslationUnit getTranslationUnit () {
+	protected ITranslationUnit getTranslationUnit () {
 		ITranslationUnit unit = null;
 		if (fEditor != null) {
 			IEditorInput editorInput= fEditor.getEditorInput();
@@ -222,6 +222,13 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate {
 				fs[0] = CCompletionContributorManager.getDefault().getFunctionInfo(name);
 			}
 		};
+		try {
+			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(op);
+		} catch (InvocationTargetException e) {
+			ExceptionHandler.handle(e, getShell(), CEditorMessages.getString("AddIncludeOnSelection.error.message1"), null); //$NON-NLS-1$
+		} catch (InterruptedException e) {
+			// Do nothing. Operation has been canceled.
+		}
 		return fs[0];
 	}