diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
index 30f0d82898a..f71e57f106f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
@@ -1090,6 +1090,7 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
 							ctx.fAST= ast;
 							ctx.fASTPositionConverter= astProvider.getActivePositionConverter(getInputElement());
 							fInitialASTReconcile= false;
+							computeFoldingStructure(ast, ctx);
 						}
 						return Status.OK_STATUS;
 					}
@@ -1097,8 +1098,9 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
 				if (!status.isOK()) {
 					CUIPlugin.getDefault().log(status);
 				}
+			} else {
+				computeFoldingStructure(ast, ctx);
 			}
-			computeFoldingStructure(ast, ctx);
 		}
 	}