diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index fdb4bf9d9..6a8a753a4 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -993,15 +993,25 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
         swfs.clear();
         oldItem = null;
         clear();
-        updateUi();      
-        
+        updateUi();
+
+        List<SWF> swfsToClose = new ArrayList<>();
         for (SWFList swfList : swfsLists) {
-            List<SWF> swfs2 = new ArrayList<>(swfList);
-            for (SWF swf : swfs2) {
-                swf.clearTagSwfs();
+            swfsToClose.addAll(swfList);
+            for (SWF swf : swfList) {
+                Main.populateSwfs(swf, swfsToClose);
             }
         }
 
+        for (SWF swf : swfsToClose) {
+            swf.clearTagSwfs();
+        }
+
+        refreshTree();
+
+        mainMenu.updateComponents(null);
+        previewPanel.clear();
+
         return true;
     }