diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsFragment.kt
index 168212588..e4f1ee85c 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsFragment.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsFragment.kt
@@ -86,8 +86,8 @@ class LanguageSettingsFragment : SubScreenFragment() {
                 }
                 // special treatment for the known languages with _ZZ types
                 // todo: later: make it a bit less weird... and probably faster
-                //  consider that more _ZZ languages might be added (e.g. hinglish)
-                if (!added && locale.language == "sr") {
+                //  consider that more _ZZ languages might be added
+                if (!added && (locale.language == "sr" || locale.language == "hi")) {
                     val languageString = locale.language
                     val iter = allSubtypes.iterator()
                     while (iter.hasNext()) {
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index 25b311050..62a0afcbc 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -416,8 +416,8 @@
             android:isAsciiCapable="false"
     />
     <!-- TODO: This Hinglish keyboard is a preliminary layout.
-               This isn't based on the final specification. -->
-    <!--  Disabled because there is no LM yet, and this layout does not offer anything different.
+               This isn't based on the final specification.
+               Was disabled because there is no LM yet, and this layout does not offer anything different. -->
     <subtype android:icon="@drawable/ic_ime_switcher_dark"
             android:label="@string/subtype_hi_ZZ"
             android:subtypeId="0x352eb37c"
@@ -426,7 +426,6 @@
             android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    -->
     <subtype android:icon="@drawable/ic_ime_switcher_dark"
             android:label="@string/subtype_generic"
             android:subtypeId="0x35b7526a"