diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java b/app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java
index e7f24940..9d50e780 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java
@@ -223,19 +223,21 @@ public class SuggestionsBar {
 			char firstChar = trimmedSuggestion.charAt(0);
 
 			String prefix = Character.isAlphabetic(firstChar) && !Characters.isCombiningPunctuation(firstChar) ? STEM_VARIATION_PREFIX : STEM_PUNCTUATION_VARIATION_PREFIX;
-			trimmedSuggestion = prefix + trimmedSuggestion;
-
-			suggestions.add(trimmedSuggestion);
+			suggestions.add(prefix + formatUnreadableSuggestion(trimmedSuggestion));
 			return;
 		}
 
-		// convert the unreadable special characters to their readable form or add the readable ones
-		switch (suggestion) {
-			case "\n" -> suggestions.add(Characters.NEW_LINE);
-			case Characters.ZWJ -> suggestions.add(Characters.ZWJ_GRAPHIC);
-			case Characters.ZWNJ -> suggestions.add(Characters.ZWNJ_GRAPHIC);
-			default -> suggestions.add(suggestion);
-		}
+		suggestions.add(formatUnreadableSuggestion(suggestion));
+	}
+
+
+	private String formatUnreadableSuggestion(String suggestion) {
+		return switch (suggestion) {
+			case "\n" -> Characters.NEW_LINE;
+			case Characters.ZWJ -> Characters.ZWJ_GRAPHIC;
+			case Characters.ZWNJ -> Characters.ZWNJ_GRAPHIC;
+			default -> suggestion;
+		};
 	}