1 files changed, 6 insertions, 1 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/ClassSelector.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/ClassSelector.java
index 4b9fa595..5f53f4d8 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/ClassSelector.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/ClassSelector.java
@@ -265,7 +265,12 @@ public class ClassSelector extends JTree {
         }
 
         public void collapseAll() {
-                for (DefaultMutableTreeNode packageNode : packageManager.getPackageNodes()) {
+                // sort the package nodes by depth, so we collapse the deepest nodes first
+                List<DefaultMutableTreeNode> packageNodes = new ArrayList<>(packageManager.getPackageNodes());
+                packageNodes.sort(Comparator.comparingInt(DefaultMutableTreeNode::getDepth));
+
+                // collapse the nodes
+                for (DefaultMutableTreeNode packageNode : packageNodes) {
                         collapsePath(new TreePath(packageNode.getPath()));
                 }
         }