diff --git a/.vs/Toolbox/v15/.suo b/.vs/Toolbox/v15/.suo
index 5e3e36af..555451da 100644
Binary files a/.vs/Toolbox/v15/.suo and b/.vs/Toolbox/v15/.suo differ
diff --git a/Switch_Toolbox_Library/Helpers/TreeHelper.cs b/Switch_Toolbox_Library/Helpers/TreeHelper.cs
index 078cf09e..9f650183 100644
--- a/Switch_Toolbox_Library/Helpers/TreeHelper.cs
+++ b/Switch_Toolbox_Library/Helpers/TreeHelper.cs
@@ -213,7 +213,7 @@ namespace Toolbox.Library
                     if (parentNode is ArchiveRootNodeWrapper)
                         ((ArchiveRootNodeWrapper)parentNode).AddFileNode(File);
                     if (parentNode is ArchiveFolderNodeWrapper)
-                        ((ArchiveRootNodeWrapper)parentNode).AddFileNode(File);
+                        ((ArchiveFolderNodeWrapper)parentNode).RootNode.AddFileNode(File);
 
                     parentNode.Nodes.Add(File);
                 }
@@ -238,12 +238,12 @@ namespace Toolbox.Library
 
             foreach (var node in TreeViewExtensions.Collect(folderNode.Nodes))
             {
-                var parentNode = node.Parent;
-                parentNode.Nodes.Remove(node);
-
                 if (node is ArchiveFileWrapper)
                     archiveFile.DeleteFile(((ArchiveFileWrapper)node).ArchiveFileInfo);
             }
+
+            var parentNode = folderNode.Parent;
+            parentNode.Nodes.Remove(folderNode);
         }
     }
 }
diff --git a/Switch_Toolbox_Library/Toolbox.Library.dll b/Switch_Toolbox_Library/Toolbox.Library.dll
index 54612772..43834661 100644
Binary files a/Switch_Toolbox_Library/Toolbox.Library.dll and b/Switch_Toolbox_Library/Toolbox.Library.dll differ
diff --git a/Switch_Toolbox_Library/Toolbox.Library.pdb b/Switch_Toolbox_Library/Toolbox.Library.pdb
index bd405165..f0b6d1b1 100644
Binary files a/Switch_Toolbox_Library/Toolbox.Library.pdb and b/Switch_Toolbox_Library/Toolbox.Library.pdb differ