diff --git a/java/src/org/futo/inputmethod/latin/uix/ActionBar.kt b/java/src/org/futo/inputmethod/latin/uix/ActionBar.kt
index 05a172f5f..7d576797e 100644
--- a/java/src/org/futo/inputmethod/latin/uix/ActionBar.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/ActionBar.kt
@@ -176,6 +176,8 @@ fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, isPrimary: Boolean,
         null
     }
 
+    val actualIsPrimary = isPrimary && (words.mWillAutoCorrect || ((wordInfo?.isExactMatch) == true))
+
     val iconColor = MaterialTheme.colorScheme.onBackground
     val topSuggestionIcon = painterResource(id = R.drawable.transformer_suggestion)
     val textButtonModifier = when (wordInfo?.mOriginatesFromTransformerLM) {
@@ -188,7 +190,7 @@ fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, isPrimary: Boolean,
                 ) {
                     draw(
                         topSuggestionIcon.intrinsicSize,
-                        alpha = if(isPrimary){ 1.0f } else { 0.66f } / 1.25f,
+                        alpha = if(actualIsPrimary){ 1.0f } else { 0.66f } / 1.25f,
                         colorFilter = ColorFilter.tint(color = iconColor)
                     )
                 }
@@ -197,12 +199,12 @@ fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, isPrimary: Boolean,
         else -> Modifier
     }
 
-    val textModifier = when (isPrimary) {
+    val textModifier = when (actualIsPrimary) {
         true -> Modifier
         false -> Modifier.alpha(0.75f)
     }
 
-    val textStyle = when (isPrimary) {
+    val textStyle = when (actualIsPrimary) {
         true -> suggestionStylePrimary
         false -> suggestionStyleAlternative
     }.copy(color = MaterialTheme.colorScheme.onBackground)
diff --git a/java/src/org/futo/inputmethod/latin/xlm/LanguageModel.java b/java/src/org/futo/inputmethod/latin/xlm/LanguageModel.java
index f9ecfc3c5..b4ec0bd2a 100644
--- a/java/src/org/futo/inputmethod/latin/xlm/LanguageModel.java
+++ b/java/src/org/futo/inputmethod/latin/xlm/LanguageModel.java
@@ -240,9 +240,13 @@ public class LanguageModel extends Dictionary {
         for(int i=0; i<maxResults; i++) {
             if(outStrings[i] == null) continue;
 
+            int currKind = kind;
             String word = outStrings[i].trim();
+            if(word.equals(partialWord)) {
+                currKind |= SuggestedWords.SuggestedWordInfo.KIND_FLAG_EXACT_MATCH;
+            }
 
-            suggestions.add(new SuggestedWords.SuggestedWordInfo( word, context, (int)(outProbabilities[i] * 100.0f), kind, this, 0, 0 ));
+            suggestions.add(new SuggestedWords.SuggestedWordInfo( word, context, (int)(outProbabilities[i] * 100.0f), currKind, this, 0, 0 ));
         }
 
         /*