diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4364de88..dcec0280e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 - [#2070] forceWriteAsLong Tag internal attribute is now visible and editable
  (including XML export), allows decide whether to write length in tag header as long
 - [#2073] Editing of frame count in SWF header (with warning that it won't update ShowFrame count)
+- Show font AS linkage class in its name in the tree (besides font name)
 
 ### Fixed
 - [#2043] StartSound2 tag handling
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/FontTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/FontTag.java
index 13d16d000..2a2ff9ac8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/FontTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/FontTag.java
@@ -206,15 +206,21 @@ public abstract class FontTag extends DrawableTag implements AloneTag {
     @Override
     public String getName() {
         String nameAppend = "";
+        List<String> nameAppendList = new ArrayList<>();
         if (exportName != null) {
-            nameAppend = ": " + exportName;
+            nameAppendList.add(exportName);
         }
         if (className != null) {
-            nameAppend = ": " + className;
+            nameAppendList.add(className);
         }
         String fontName = getFontNameIntag();
         if (fontName != null) {
-            nameAppend = ": " + fontName;
+            nameAppendList.add(fontName);
+        }
+        
+        if (!nameAppendList.isEmpty())
+        {
+            nameAppend = ": " + String.join(", ", nameAppendList);
         }
         return tagName + " (" + getCharacterId() + nameAppend + ")";
     }