diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBoxTree.java b/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBoxTree.java
index 892f75ff983..16e99154e8d 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBoxTree.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBoxTree.java
@@ -346,6 +346,13 @@ public class FCheckBoxTree extends JTree {
         }
         if (lastChildNodePath != null)
             updatePredecessors(lastChildNodePath);
+        else {
+            // leafNode
+            if (selectStatus)
+                checkedPaths.add(treePath);
+            else
+                checkedPaths.remove(treePath);
+        }
     }
 
     private void setPathCheckStatus(TreePath tp, boolean checkStatus) {