diff --git a/src/bonsai/bonsai/tool/aggregate.py b/src/bonsai/bonsai/tool/aggregate.py
index a65dbc3b5f..7fe6bd9289 100644
--- a/src/bonsai/bonsai/tool/aggregate.py
+++ b/src/bonsai/bonsai/tool/aggregate.py
@@ -194,10 +194,14 @@ class Aggregate(bonsai.core.tool.Aggregate):
             if not element:
                 continue
 
-        objs = [o.obj for o in props.editing_objects]
+        parts = ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(props.editing_aggregate))
+        objs = [tool.Ifc.get_object(part) for part in parts]
         for obj in objs:
             tool.Aggregate.enable_constraints(obj)
 
+        if context.space_data.local_view:
+            bpy.ops.view3d.localview()
+
         props.in_aggregate_mode = False
         props.not_editing_objects.clear()
         props.editing_objects.clear()