diff --git a/ide/codetoolsoptions.pas b/ide/codetoolsoptions.pas
index a214864631..48560ffd13 100644
--- a/ide/codetoolsoptions.pas
+++ b/ide/codetoolsoptions.pas
@@ -601,7 +601,7 @@ begin
     FIdentComplUseContainsFilter:=XMLConfig.GetValue(
       'CodeToolsOptions/IdentifierCompletion/UseContainsFilter',true);
     FIdentComplIncludeKeywords:=XMLConfig.GetValue(
-      'CodeToolsOptions/IdentifierCompletion/IncludeKeywords',true);
+      'CodeToolsOptions/IdentifierCompletion/IncludeKeywords',false);
     FIdentComplIncludeCodeTemplates:=XMLConfig.GetValue(
       'CodeToolsOptions/IdentifierCompletion/IncludeCodeTemplates',true);
     FIdentComplIncludeWords:=IdentComplIncludeWordsNamesToEnum(XMLConfig.GetValue(
@@ -788,7 +788,7 @@ begin
     XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/UseContainsFilter',
       FIdentComplUseContainsFilter,true);
     XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/IncludeKeywords',
-      FIdentComplIncludeKeywords,true);  
+      FIdentComplIncludeKeywords,false);
     XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/IncludeCodeTemplates',
       FIdentComplIncludeCodeTemplates,true);
     XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/IncludeWords',
@@ -1022,7 +1022,7 @@ begin
   FIdentComplAutoStartAfterPoint:=true;
   FIdentComplAutoUseSingleIdent:=true;
   FIdentComplUseContainsFilter:=true;
-  FIdentComplIncludeKeywords := True;
+  FIdentComplIncludeKeywords := false;
   FIdentComplIncludeCodeTemplates:=true;
   FIdentComplShowIcons:=false;
   FIdentComplAddParameterBrackets:=true;
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index fa5f2178a3..13a87cf8f9 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -2066,7 +2066,7 @@ resourcestring
   dlgIncludeWordsToIdentCompl_IncludeFromAllUnits = 'from all units';
   dlgIncludeWordsToIdentCompl_IncludeFromCurrentUnit = 'from current unit';
   dlgIncludeWordsToIdentCompl_DontInclude = 'don''t include';
-  dlgIncludeKeywordsToIdentCompl = 'Include keywords';
+  dlgIncludeKeywordsToIdentCompl = 'Include all keywords and operators';
   dlgIncludeCodeTemplatesToIdentCompl = 'Include code templates';
 
   dlgMarkupUserDefined = 'User defined markup';