diff --git a/lib/I18n/I18nKeys.h b/lib/I18n/I18nKeys.h
index a381e6b3..af10f522 100644
--- a/lib/I18n/I18nKeys.h
+++ b/lib/I18n/I18nKeys.h
@@ -408,8 +408,8 @@ inline const char* const* getStringArray(Language lang) {
 constexpr uint8_t getLanguageCount() { return static_cast<uint8_t>(Language::_COUNT); }
 
 // Sorted language indices by code (auto-generated by gen_i18n.py)
-// Order: English,
-// Беларуская, Català, Čeština, Dansk, Deutsch, Español, Suomi, Français, Italiano, Қазақша, Nederlands, Polski, Português (Brasil), Română, Русский, Svenska, Türkçe, Українська
+// Order: English, Беларуская, Català, Čeština, Dansk, Deutsch, Español, Suomi, Français, Italiano
+// Қазақша, Nederlands, Polski, Português (Brasil), Română, Русский, Svenska, Türkçe, Українська
 constexpr uint8_t SORTED_LANGUAGE_INDICES[] = {0, 11, 9, 4, 15, 3, 1, 14, 2, 12, 18, 16, 13, 5, 8, 6, 7, 17, 10};
 
 static_assert(sizeof(SORTED_LANGUAGE_INDICES) / sizeof(SORTED_LANGUAGE_INDICES[0]) == getLanguageCount(),
diff --git a/scripts/gen_i18n.py b/scripts/gen_i18n.py
index b33da65f..df77bce4 100755
--- a/scripts/gen_i18n.py
+++ b/scripts/gen_i18n.py
@@ -470,12 +470,18 @@ def generate_keys_header(
     names = [language_names[i] for i in sorted_indices]
     comment_names = ", ".join(names)
     lines.append("// Sorted language indices by code (auto-generated by gen_i18n.py)")
-    if len(f"// Order: {comment_names}") <= 100:
+    if len(f"// Order: {comment_names}") <= 120:
         lines.append(f"// Order: {comment_names}")
     else:
-        lines.append("// Order: " + names[0] + ",")
-        rest_line = ", ".join(names[1:])
-        lines.append("// " + rest_line)
+        current = "// Order: "
+        for name in names:
+            candidate = current + name + ", "
+            if len(candidate) > 100:
+                lines.append(current.rstrip(", "))
+                current = "// " + name + ", "
+            else:
+                current = candidate
+        lines.append(current.rstrip(", "))
     lines.append(
         "constexpr uint8_t SORTED_LANGUAGE_INDICES[] = {"
         f"{', '.join(str(i) for i in sorted_indices)}"