diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index a8a5d0412c5..a3e291556c6 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,6 @@
+2004-03-09 Hoda Amer
+	Fix for bug#52188: Content Assist: Disabling the '.' (dot) and '->' triggers has no effect.
+	
 2004-03-08 Hoda Amer
 	Partial fix for bug#52948 : Content Assist: typedef-ed types do not appear in the completion list.
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java
index 5d142e57595..bc27082f197 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java
@@ -146,24 +146,23 @@ public class ContentAssistPreference {
 		if (jcp == null)
 			return;
 			
-		if (AUTOACTIVATION_TRIGGERS_DOT.equals(key)) {
+		if ( (AUTOACTIVATION_TRIGGERS_DOT.equals(key)) 
+		     || (AUTOACTIVATION_TRIGGERS_ARROW.equals(key))
+			 || (AUTOACTIVATION_TRIGGERS_DOUBLECOLON.equals(key)) ){
 			boolean useDotAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_DOT);
-			if (useDotAsTrigger){
-				String triggers= "."; //$NON-NLS-1$
-				jcp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());
-			}
-		} else if (AUTOACTIVATION_TRIGGERS_ARROW.equals(key)) {
 			boolean useArrowAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_ARROW);
-			if (useArrowAsTrigger){
-				String triggers= ">"; //$NON-NLS-1$
-				jcp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());
-			}
-		} else if (AUTOACTIVATION_TRIGGERS_DOUBLECOLON.equals(key)) {
 			boolean useDoubleColonAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_DOUBLECOLON);
-			if (useDoubleColonAsTrigger){
-				String triggers= ":"; //$NON-NLS-1$
-				jcp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());
+			String triggers = "";
+			if (useDotAsTrigger){
+				triggers += "."; //$NON-NLS-1$
 			}
+			if (useArrowAsTrigger){
+				triggers += ">"; //$NON-NLS-1$
+			}
+			if (useDoubleColonAsTrigger){
+				triggers += ":"; //$NON-NLS-1$
+			}
+			jcp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());
 		} else if (SHOW_DOCUMENTED_PROPOSALS.equals(key)) {
 			//boolean enabled= store.getBoolean(SHOW_DOCUMENTED_PROPOSALS);
 			//jcp.restrictProposalsToVisibility(enabled);