diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef8020d0..92a77851 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Mini-explorer, clearing the filter had for effect to scan the root folder instead of the selected one. (#129)
 - Mini-explorer, on startup selected folder becomes the root, instead of the previous root. (#130)
 - With dark themes warning message on exit was barely legible.
+- Editor, completions, better behavior with `..` and when "auto-dot" is enabled (_autoDotDelay_ > 0).
 
 # v3.9.26
 
diff --git a/src/u_synmemo.pas b/src/u_synmemo.pas
index 8de9e873..a15ad3fa 100644
--- a/src/u_synmemo.pas
+++ b/src/u_synmemo.pas
@@ -3014,6 +3014,11 @@ procedure TDexedMemo.completionCodeCompletion(var value: string;
 begin
   if KeyChar = '' then
     exit;
+  if (KeyChar = '.') and (SourceValue <> value) then
+  begin
+    value := SourceValue + '.';
+    exit;
+  end;
   if KeyChar[1] = ' ' then
     value := sourceValue + KeyChar[1]
   else