diff --git a/src/com/jpexs/decompiler/flash/gui/FontPanel.java b/src/com/jpexs/decompiler/flash/gui/FontPanel.java
index 18f639b82..e3fc99deb 100644
--- a/src/com/jpexs/decompiler/flash/gui/FontPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/FontPanel.java
@@ -198,7 +198,7 @@ public class FontPanel extends javax.swing.JPanel {
         String chars = ft.getCharacters(swf.tags);
         fontCharactersTextArea.setText(chars);
         setAllowSave(false);
-        String key = swf.getShortFileName() + "_" + ft.getFontId() + "_" + ft.getFontName();
+        String key = swf.getShortFileName() + "_" + ft.getFontId() + "_" + ft.getFontNameIntag();
 
         String selectedFont;
 
diff --git a/src/com/jpexs/decompiler/flash/gui/TextPanel.java b/src/com/jpexs/decompiler/flash/gui/TextPanel.java
index 6452f5713..7217824ff 100644
--- a/src/com/jpexs/decompiler/flash/gui/TextPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/TextPanel.java
@@ -131,9 +131,9 @@ public class TextPanel extends JPanel implements ActionListener {
                     TextTag textTag = (TextTag) item;
                     if (mainPanel.saveText(textTag, textValue.getText(), null)) {
                         setEditText(false);
+                        item.getSwf().clearImageCache();
                         mainPanel.reload(true);
                     }
-                    item.getSwf().clearImageCache();
                 }
                 break;
         }