diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index a01103acfc1..1c033be3a73 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -1717,6 +1717,8 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
 			fProjectionSupport = null;
 		}
 
+    	uninstallSemanticHighlighting();
+    	
 		if (fCEditorErrorTickUpdater != null) {
 			fCEditorErrorTickUpdater.dispose();
 			fCEditorErrorTickUpdater = null;