diff --git a/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java b/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
index 5476fcdf47..91f455190b 100644
--- a/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
+++ b/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
@@ -247,12 +247,18 @@ public class JMeterTreeTransferHandler extends TransferHandler {
             // working on the original node would be harder as 
             //    you'll have to deal with the insertion index offset if you re-order a node inside a parent
             JMeterTreeNode copy = (JMeterTreeNode) nodes[i].clone();
+            
+            // first copy the children as the call to copy.add will modify the collection we're iterating on
             Enumeration<?> enumFrom = nodes[i].children();
+            List<JMeterTreeNode> tmp = new ArrayList<JMeterTreeNode>();
             while (enumFrom.hasMoreElements()) {
                 JMeterTreeNode child = (JMeterTreeNode) enumFrom.nextElement();
-                copy.add(child);
+                tmp.add(child);
             }
             
+            for (JMeterTreeNode jMeterTreeNode : tmp) {
+                copy.add(jMeterTreeNode);
+            }
             guiInstance.getTreeModel().insertNodeInto(copy, target, index++);
             nodesForRemoval.add(nodes[i]);
         }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e15c43e244..627a92c1cd 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -141,6 +141,7 @@ It was therefore necessary to change the shortcut.
 <li><bugzilla>54504</bugzilla> - Resource string not found: [clipboard_node_read_error]</li>
 <li><bugzilla>54538</bugzilla> - GUI: context menu is too big</li>
 <li><bugzilla>54847</bugzilla> - Cut &amp; Paste is broken with tree multi-selection</li>
+<li><bugzilla>54870</bugzilla> - Tree D&D may lost leaf nodes (affected nightly build)</li>
 </ul>
 
 <!-- =================== Improvements =================== -->