diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs b/Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs
index c8f0aa5e..345af0b0 100644
--- a/Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs	
+++ b/Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs	
@@ -531,7 +531,12 @@ public static void DrawPropertyChildren(SerializedProperty property, Action<Seri
                 enterChildren = false;
                 var childProperty = targetProperty.Copy();
                 //handle current property using Toolbox features
+                EditorGUI.BeginChangeCheck();
                 drawElementAction(childProperty);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    break;
+                }
             }
         }