diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas
index 37f2e68e..80609667 100644
--- a/src/ce_editoroptions.pas
+++ b/src/ce_editoroptions.pas
@@ -195,6 +195,7 @@ begin
   fMouseLinkAttribs := TSynSelectedColor.Create;
   fBracketMatchAttribs := TSynSelectedColor.Create;
   fIdentifierMarkup := TSynSelectedColor.Create;
+  fCompletionMenuCaseCare := true;
   //
   // note: default values come from TSynEditFoldedView ctor.
   fFoldedColor.Background := clNone;
@@ -642,6 +643,7 @@ begin
   anEditor.completionMenu.TheForm.Width   := fCompletionMenuWidth;
   anEditor.completionMenu.LinesInWindow   := fCompletionMenuLines;
   anEditor.completionMenu.CaseSensitive   := fCompletionMenuCaseCare;
+  TStringList(anEditor.completionMenu.ItemList).CaseSensitive := fCompletionMenuCaseCare;
 
   anEditor.Gutter.LineNumberPart.ShowOnlyLineNumbersMultiplesOf:=fLineNumEvery;
 
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index 2215658d..89e93321 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -725,7 +725,8 @@ begin
   fCompletion.OnExecute:= @completionExecute;
   fCompletion.OnCodeCompletion:=@completionCodeCompletion;
   fCompletion.OnPaintItem:= @completionItemPaint;
-  fCompletion.CaseSensitive:=false;
+  fCompletion.CaseSensitive:=true;
+  TStringList(fCompletion.ItemList).CaseSensitive:=true;
   fCompletion.LongLineHintType:=sclpNone;
   fCompletion.TheForm.ShowInTaskBar:=stNever;
   fCompletion.ShortCut:=0;