diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CWordDetector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CWordDetector.java
index c104926d8f5..f464b26aef2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CWordDetector.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CWordDetector.java
@@ -12,13 +12,12 @@ import org.eclipse.jface.text.rules.IWordDetector;
  * A C aware word detector.
  */
 public class CWordDetector implements IWordDetector {
-
-
+			
 	/**
 	 * @see IWordDetector#isWordIdentifierStart
 	 */
 	public boolean isWordStart(char c) {
-		return Character.isJavaIdentifierStart(c);
+		return Character.isJavaIdentifierStart(c) || c == '#';
 	}
 	
 	/**