diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88b79b906..90fa214da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@ All notable changes to this project will be documented in this file.
 - ABC cleaner not properly fixing namespace sets
 - The hex view does not display bytes if there are too few of them
 - SymbolClass export/import did not support obfuscated names
+- Configuration TOML file encoding (UTF-8)
 
  ### Changed
 - Icon of "Deobfuscation options" menu from pile of pills to medkit
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java
index c02b8097c..f4262d892 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.AppResources;
 import com.jpexs.decompiler.flash.ApplicationInfo;
 import com.jpexs.decompiler.flash.types.RGB;
 import com.jpexs.helpers.Helper;
+import com.jpexs.helpers.utf8.Utf8Helper;
 import java.awt.Color;
 import java.io.File;
 import java.io.FileWriter;
@@ -278,7 +279,7 @@ public class TomlConfigurationStorage implements ConfigurationStorage {
             modifiedOnly = true;
         }
         try (
-                Writer w = new FileWriter(file); PrintWriter pw = new PrintWriter(w)) {
+                Writer w = new FileWriter(file, Utf8Helper.charset); PrintWriter pw = new PrintWriter(w)) {
             String header = AppResources.translate("configurationFile").replace("%app%", ApplicationInfo.APPLICATION_NAME);
             String splitter = stringOfChar('-', header.length());
             pw.println("# " + splitter);