diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java
index 76db85d0930..51f2f5a91c3 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java
@@ -1335,6 +1335,11 @@ public class CPPBuildASTParserAction extends BuildASTParserAction {
 	public void consumeInitDeclaratorComplete() {
 		if(TRACE_ACTIONS) DebugUtil.printMethodTrace();
 
+		// Don't do disambiguation when parsing for content assist,
+		// trust me this makes things work out a lot better.
+		if(completionNode != null)
+			return;
+		
 		IASTDeclarator declarator = (IASTDeclarator) astStack.peek();
 		if(!(declarator instanceof IASTFunctionDeclarator))
 			return;