diff --git a/src/components/floor-plan/modal/basic/step/Orientation.jsx b/src/components/floor-plan/modal/basic/step/Orientation.jsx
index ae03ca56..f78d4cd9 100644
--- a/src/components/floor-plan/modal/basic/step/Orientation.jsx
+++ b/src/components/floor-plan/modal/basic/step/Orientation.jsx
@@ -65,6 +65,12 @@ export const Orientation = forwardRef((props, ref) => {
     ],
   }
 
+  useEffect(() => {
+    if (selectedModules) {
+      setSelectedModules(moduleList.find((module) => module.itemId === selectedModules.itemId))
+    }
+  }, [selectedModules])
+
   useEffect(() => {
     if (selectedSurfaceType) {
       setInputRoughness(roughnessCodes.find((code) => code.clCode === managementState?.surfaceTypeValue))
@@ -312,8 +318,8 @@ export const Orientation = forwardRef((props, ref) => {
                     {moduleList && (
                       <QSelectBox
                         options={moduleList}
-                        value={moduleSelectionInitParams}
-                        targetKey={'moduleItemId'}
+                        value={selectedModules}
+                        targetKey={'itemId'}
                         sourceKey={'itemId'}
                         showKey={'itemNm'}
                         onChange={(e) => handleChangeModule(e)}
diff --git a/src/hooks/module/useModuleTrestle.js b/src/hooks/module/useModuleTrestle.js
index ff6acb17..e657c3c0 100644
--- a/src/hooks/module/useModuleTrestle.js
+++ b/src/hooks/module/useModuleTrestle.js
@@ -78,6 +78,7 @@ export function useModuleTrestle(props) {
     setCvrChecked(selectedRoof?.construction?.cvrChecked ?? false)
     setSnowGdPossYn(selectedRoof?.construction?.snowGdPossYn ?? 'N')
     setSnowGdChecked(selectedRoof?.construction?.snowGdChecked ?? false)
+    setTrestleDetail(selectedRoof?.trestleDetail)
   }, [selectedRoof])
 
   useEffect(() => {