diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index c2ce0541..01ab7957 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
index 9b274614..cd729a9f 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
index 36052122..29bb64a2 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
index 133854ee..1642d9c7 100644
Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ
diff --git a/Switch_Toolbox_Library/Forms/Archive/ArchiveFilePanel.cs b/Switch_Toolbox_Library/Forms/Archive/ArchiveFilePanel.cs
index a6aa7cb4..0b0ebb0f 100644
--- a/Switch_Toolbox_Library/Forms/Archive/ArchiveFilePanel.cs
+++ b/Switch_Toolbox_Library/Forms/Archive/ArchiveFilePanel.cs
@@ -95,12 +95,13 @@ namespace Switch_Toolbox.Library.Forms
             {
                 var Editor = ((TreeNodeFile)fileFormat).GetEditor();
                 var ActiveEditor = GetActiveEditor(Editor.GetType());
-                if (ActiveEditor != null)
+                if (ActiveEditor == null)
+                    AddControl(Editor);
+                else
                     Editor = ActiveEditor;
 
                 ((TreeNodeFile)fileFormat).FillEditor(Editor);
 
-                AddControl(Editor);
             }
 
             Type objectType = fileFormat.GetType();
@@ -111,10 +112,10 @@ namespace Switch_Toolbox.Library.Forms
                     System.Reflection.MethodInfo method = objectType.GetMethod("OpenForm");
                     var Editor = (UserControl)method.Invoke(fileFormat, new object[0]);
                     var ActiveEditor = GetActiveEditor(Editor.GetType());
-                    if (ActiveEditor != null)
+                    if (ActiveEditor == null)
+                        AddControl(Editor);
+                    else
                         Editor = ActiveEditor;
-
-                    AddControl(Editor);
                 }
             }
         }
diff --git a/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditor.cs b/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditor.cs
index 1f7ce2f3..0f40ddd3 100644
--- a/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditor.cs	
+++ b/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditor.cs	
@@ -110,12 +110,15 @@ namespace Switch_Toolbox.Library.Forms
             AddNode(FileRoot);
         }
 
+        //The process takes awhile atm so limit splitting if there's a high amount
+        private readonly int MAX_FILE_PATH_SPLIT = 5000;
+
         void FillTreeNodes(TreeNode root, IArchiveFile archiveFile)
         {
             var rootText = root.Text;
             var rootTextLength = rootText.Length;
             var nodeFiles = archiveFile.Files;
-            if (nodeFiles.Count() > 400)
+            if (nodeFiles.Count() > MAX_FILE_PATH_SPLIT)
             {
                 foreach (var node in nodeFiles)
                 {