diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx
index 6bdfd8ce..d34c36fb 100644
--- a/src/components/floor-plan/modal/basic/step/Trestle.jsx
+++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx
@@ -222,6 +222,7 @@ const Trestle = forwardRef((props, ref) => {
       if (i === selectedRoof?.index) {
         return {
           ...selectedRoof,
+          addRoof: roof,
           trestle: trestleState,
           eavesMargin,
           ridgeMargin,
@@ -267,7 +268,7 @@ const Trestle = forwardRef((props, ref) => {
         ...moduleSelectionData,
         roofConstructions: newAddedRoofs.map((roof, index) => {
           return {
-            roofIndex: index,
+            roofIndex: roof.index,
             addRoof: {
               ...moduleSelectionData.roofConstructions[index]?.addRoof,
               ...roof.addRoof,