diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/PunctuationScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/PunctuationScreen.java
index fd675a3b..ac597abe 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/PunctuationScreen.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/PunctuationScreen.java
@@ -54,7 +54,7 @@ public class PunctuationScreen extends BaseScreenFragment {
 		initLanguageList();
 		initResetDefaults();
 		initSaveButton();
-		onLanguageChanged(languageList.getValue());
+		loadCharLists();
 		resetFontSize(false);
 	}
 
@@ -115,4 +115,14 @@ public class PunctuationScreen extends BaseScreenFragment {
 			}
 		}
 	}
+
+
+	private void loadCharLists() {
+		if (activity != null) {
+			for (Language lang : LanguageCollection.getAll(activity.getSettings().getEnabledLanguageIds())) {
+				activity.getSettings().setDefaultCharOrder(lang, false);
+			}
+		}
+		onLanguageChanged(languageList.getValue());
+	}
 }
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 b8cab36e..df486829 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
@@ -12,11 +12,11 @@ import io.github.sspanak.tt9.ui.tray.SuggestionsBar;
 import io.github.sspanak.tt9.util.chars.Characters;
 
 class SettingsPunctuation extends SettingsInput {
-	private final static String CHARS_1_PREFIX = "pref_punctuation_";
+	private final static String CHARS_1_PREFIX = "punctuation_order_key_1_initial_";
 	public final static String CHARS_GROUP_1 = "punctuation_order_key_1_group";
 	public final static String CHARS_AFTER_GROUP_1 = "punctuation_order_key_1_after_group";
 
-	private final static String CHARS_0_PREFIX = "pref_special_chars_";
+	private final static String CHARS_0_PREFIX = "punctuation_order_key_0_initial_";
 	public final static String CHARS_GROUP_0 = "punctuation_order_key_0_group";
 	public final static String CHARS_AFTER_GROUP_0 = "punctuation_order_key_0_after_group";