diff --git a/CHANGES.md b/CHANGES.md
index a9342530a6e..664c09a485e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,5 @@
 # 6.5.4 2023-??-??
+ - 2023-08-03 Fixed Bug - Snippets not sorted by name in search results. [#473](https://github.com/znuny/Znuny/issues/473)
  - 2023-08-02 Fixed Popup profile positioning. Thanks to Paweł Bogusławski (@pboguslawski). [#432](https://github.com/znuny/Znuny/pull/432)
  - 2023-07-31 Fixed Draft Issue - Using the draft fails if there are any dynamic fields configured as mandatory for the screen where the draft is used.
  - 2023-07-27 Fixed remove of mention and unnecessary errors in the log. Thanks to Tim Püttmanns (@tipue-dev), maxence. [PR#295](https://github.com/znuny/Znuny/pull/295)
diff --git a/Kernel/System/Autocompletion/Template.pm b/Kernel/System/Autocompletion/Template.pm
index 59f477c820d..3130d1c41f5 100644
--- a/Kernel/System/Autocompletion/Template.pm
+++ b/Kernel/System/Autocompletion/Template.pm
@@ -114,7 +114,9 @@ sub GetData {
     # Build autocompletion information for templates.
     my @Data;
     STANDARDTEMPLATEID:
-    for my $StandardTemplateID ( sort keys %StandardTemplates ) {
+    for my $StandardTemplateID ( sort { lc $StandardTemplates{$a} cmp lc $StandardTemplates{$b} || $a cmp $b }
+        keys %StandardTemplates )
+    {
         my %StandardTemplate = $StandardTemplateObject->StandardTemplateGet(
             ID => $StandardTemplateID,
         );