diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java
index b8bed7da..2029ee6d 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java
@@ -211,8 +211,12 @@ abstract public class InputMode {
 
 	protected ArrayList<String> getAbbreviatedSpecialChars() {
 		ArrayList<String> special = Characters.getWhitespaces(language);
-		special.add(SuggestionsBar.SHOW_CURRENCIES_SUGGESTION);
-		special.add(SuggestionsBar.SHOW_SPECIAL_CHARS_SUGGESTION);
+		if (!Characters.getCurrencies(language).isEmpty()) {
+			special.add(SuggestionsBar.SHOW_CURRENCIES_SUGGESTION);
+		}
+		if (!settings.getSpecialChars(language).isEmpty()) {
+			special.add(SuggestionsBar.SHOW_SPECIAL_CHARS_SUGGESTION);
+		}
 		return special;
 	}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsPunctuation.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsPunctuation.java
index e5845334..65f5390a 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsPunctuation.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsPunctuation.java
@@ -87,10 +87,6 @@ class SettingsPunctuation extends SettingsInput {
 			orderedChars = getPunctuationAsList(language);
 		}
 
-		if (orderedChars.isEmpty()) {
-			orderedChars = language.getKeyCharacters(number);
-		}
-
 		return orderedChars;
 	}