diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57d3b795..5e7f0f75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@
 - GDB commander: the context menu of the ASM view allows to resume execution until the selected instruction. (#71)
 - Search results: use GNU style messages. (#84)
 
+## Regressions fixed
+
+- editor, _closeCompletionCharsWithSpace_ broken by [git b65bb860](https://gitlab.com/basile.b/dexed/-/commit/b65bb860e45c47e3c48bf513aeafd9968daa2482).
+
 ## Bugs fixed
 
 - D2 highlighter: for `Call()`, `Call` wont be considered anymore as a type. (#69)
diff --git a/src/u_synmemo.pas b/src/u_synmemo.pas
index 3edd353a..3cb205f8 100644
--- a/src/u_synmemo.pas
+++ b/src/u_synmemo.pas
@@ -283,7 +283,6 @@ type
     procedure completionDeleteKey(sender: TObject);
     procedure getCompletionList;
     procedure completionFormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure completionFormUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
     function completionItemPaint(const AKey: string; ACanvas: TCanvas;X, Y: integer;
       Selected: boolean; Index: integer): boolean;
     procedure completionCodeCompletion(var value: string; SourceValue: string;
@@ -1144,7 +1143,6 @@ begin
   fCompletion.OnPaintItem:= @completionItemPaint;
   fCompletion.OnKeyDelete:= @completionDeleteKey;
   fCompletion.OnKeyDown:= @completionFormKeyDown;
-  fCompletion.OnUTF8KeyPress:= @completionFormUTF8KeyPress;
   fCompletion.CaseSensitive:=true;
   TStringList(fCompletion.ItemList).CaseSensitive:=true;
   fCompletion.LongLineHintType:=sclpNone;
@@ -2944,10 +2942,20 @@ begin
   else
   begin
     fLastCompletion := value;
-    if KeyChar[1] in fCloseCompletionCharsWithSpace then
-      value += ' ' + KeyChar[1]
-    else if KeyChar[1] in fCloseCompletionChars then
-      value += KeyChar[1];
+    if (KeyChar[1] in fCloseCompletionCharsWithSpace) then
+    begin
+      if value.StartsWith(SourceValue) then
+        value += ' ' + KeyChar[1]
+      else
+        value := sourceValue + KeyChar[1];
+    end
+    else if (KeyChar[1] in fCloseCompletionChars) then
+    begin
+      if value.StartsWith(SourceValue) then
+        value += KeyChar[1]
+      else
+        value := sourceValue + KeyChar[1];
+    end;
   end;
 end;
 
@@ -2957,21 +2965,6 @@ begin
     key := 13;
 end;
 
-procedure TDexedMemo.completionFormUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
-const
-  s: string = '!()[],<>=+-/*%^|&@;?:{}~';
-var
-  c: char;
-begin
-  for c in s do
-    if UTF8Key = c then
-  begin
-    UTF8Key := #0;
-    fCompletion.AddCharAtCursor(c);
-    break;
-  end
-end;
-
 function TDexedMemo.completionItemPaint(const AKey: string; ACanvas: TCanvas;X, Y: integer;
   Selected: boolean; Index: integer): boolean;
 var