diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ba8bb94..572e380d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v3.9.17-dev
+
+## Enhancements
+
+- completion: sort the completions obtained by word splitting
+
 # v3.9.16
 
 ## Enhancements
diff --git a/src/u_synmemo.pas b/src/u_synmemo.pas
index 9d136a90..c98a5fb9 100644
--- a/src/u_synmemo.pas
+++ b/src/u_synmemo.pas
@@ -2930,6 +2930,7 @@ begin
       end;
     end;
     h.Free;
+    TStringList(fCompletion.ItemList).Sort();
   end;
 
 end;