diff --git a/CHANGELOG.md b/CHANGELOG.md
index b358592c3..c48da43f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,10 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+### Fixed
 - [#1860] FLA export - EmptyStackException during exporting MorphShape
 - [#1782] FLA export - exporting from SWF files inside bundles (like binarysearch)
+- Expand correct tree on SWF load
 
 ## [16.0.3] - 2022-11-02
 ### Fixed
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 63ea30b3c..a8478f9d0 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -924,7 +924,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
     public void load(SWFList newSwfs, boolean first) {
         View.checkAccess();
 
-        List<List<String>> expandedNodes = View.getExpandedNodes(tagTree);
+        List<List<String>> expandedNodes = View.getExpandedNodes(getCurrentTree());
         previewPanel.clear();
 
         swfs.add(newSwfs);
@@ -935,7 +935,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
         doFilter();
         reload(false);
-        View.expandTreeNodes(tagTree, expandedNodes);
+        View.expandTreeNodes(getCurrentTree(), expandedNodes);
     }
 
     public ABCPanel getABCPanel() {