diff --git a/src/blenderbim/blenderbim/bim/module/model/opening.py b/src/blenderbim/blenderbim/bim/module/model/opening.py
index 9b75ec09b8..4c1d7bcbe3 100644
--- a/src/blenderbim/blenderbim/bim/module/model/opening.py
+++ b/src/blenderbim/blenderbim/bim/module/model/opening.py
@@ -265,7 +265,7 @@ class FilledOpeningGenerator:
             extrusion = shape_builder.extrude(
                 get_curve_2d_from_3d(profile),
                 magnitude=thickness / unit_scale,
-                position=Vector([0.0, - thickness * 0.5 / unit_scale, 0.0]),
+                position=Vector([0.0, -thickness * 0.5 / unit_scale, 0.0]),
                 position_x_axis=Vector((1, 0, 0)),
                 position_z_axis=Vector((0, -1, 0)),
                 extrusion_vector=Vector((0, 0, -1)),
@@ -273,7 +273,7 @@ class FilledOpeningGenerator:
             return shape_builder.get_representation(context, [extrusion])
 
         x, y, z = filling_obj.dimensions
-        opening_position = Vector([0.0, - thickness * 0.5 / unit_scale, 0.0])
+        opening_position = Vector([0.0, -thickness * 0.5 / unit_scale, 0.0])
         opening_size = Vector([x, z]) / unit_scale
 
         # Windows and doors can have a casing that overlaps the wall
@@ -754,27 +754,7 @@ class EditOpenings(Operator, tool.Ifc.Operator):
                     tool.Ifc.unlink(element=opening, obj=opening_obj)
                     bpy.data.objects.remove(opening_obj)
 
-        decomposed_building_objs = set()
-        for obj in building_objs:
-            decomposed_building_objs.add(obj)
-            for subelement in ifcopenshell.util.element.get_decomposition(tool.Ifc.get_entity(obj)):
-                subobj = tool.Ifc.get_object(subelement)
-                if subobj:
-                    decomposed_building_objs.add(subobj)
-
-        for obj in decomposed_building_objs:
-            if obj.data:
-                element = tool.Ifc.get_entity(obj)
-                body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
-                blenderbim.core.geometry.switch_representation(
-                    tool.Ifc,
-                    tool.Geometry,
-                    obj=obj,
-                    representation=body,
-                    should_reload=True,
-                    is_global=True,
-                    should_sync_changes_first=False,
-                )
+        tool.Model.reload_body_representation(building_objs)
         return {"FINISHED"}
 
     def get_all_building_objects_of_similar_openings(self, opening):
diff --git a/src/blenderbim/blenderbim/bim/module/model/window.py b/src/blenderbim/blenderbim/bim/module/model/window.py
index 6f75f7044e..f521e7d6ba 100644
--- a/src/blenderbim/blenderbim/bim/module/model/window.py
+++ b/src/blenderbim/blenderbim/bim/module/model/window.py
@@ -82,18 +82,7 @@ def update_simple_openings(element, opening_width, opening_height):
 
         has_replaced_opening_representation = True
 
-    for obj in voided_objs:
-        element = tool.Ifc.get_entity(obj)
-        body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
-        blenderbim.core.geometry.switch_representation(
-            tool.Ifc,
-            tool.Geometry,
-            obj=obj,
-            representation=body,
-            should_reload=True,
-            is_global=True,
-            should_sync_changes_first=False,
-        )
+    tool.Model.reload_body_representation(voided_objs)
 
 
 def update_window_modifier_representation(context, obj):
diff --git a/src/blenderbim/blenderbim/tool/model.py b/src/blenderbim/blenderbim/tool/model.py
index abfadc96e5..705ca56710 100644
--- a/src/blenderbim/blenderbim/tool/model.py
+++ b/src/blenderbim/blenderbim/tool/model.py
@@ -767,3 +767,35 @@ class Model(blenderbim.core.tool.Model):
             obj.matrix_world = matrix
             return
         tool.Ifc.run("geometry.edit_object_placement", product=element, matrix=matrix, is_si=True)
+
+    @classmethod
+    def reload_body_representation(cls, obj_or_objects):
+        """Update body representation including all decomposed objects"""
+        if isinstance(obj_or_objects, collections.abc.Iterable):
+            objects = set(obj_or_objects)
+        else:
+            objects = {obj_or_objects}
+
+        # decompose objects
+        decomposed_objs = objects.copy()
+        for obj in objects:
+            for subelement in ifcopenshell.util.element.get_decomposition(tool.Ifc.get_entity(obj)):
+                subobj = tool.Ifc.get_object(subelement)
+                if subobj:
+                    decomposed_objs.add(subobj)
+
+        # update representation
+        for obj in decomposed_objs:
+            if not obj.data:
+                continue
+            element = tool.Ifc.get_entity(obj)
+            body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+            blenderbim.core.geometry.switch_representation(
+                tool.Ifc,
+                tool.Geometry,
+                obj=obj,
+                representation=body,
+                should_reload=True,
+                is_global=True,
+                should_sync_changes_first=False,
+            )