diff --git a/src/hooks/module/useModule.js b/src/hooks/module/useModule.js
index a0237cf4..51cffd65 100644
--- a/src/hooks/module/useModule.js
+++ b/src/hooks/module/useModule.js
@@ -934,6 +934,9 @@ export function useModule() {
       .getObjects()
       .filter((obj) => obj.surfaceId === activeModule.surfaceId && obj.name === POLYGON_TYPE.MODULE && activeModule.id !== obj.id)
     const surface = canvas.getObjects().find((obj) => obj.id === activeModule.surfaceId && obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
+    if (surface.isComplete) {
+      removeTrestleMaterials()
+    }
     if (activeModule.circuit) {
       swalFire({
         title: getMessage('can.not.remove.module'),
diff --git a/src/hooks/useContextMenu.js b/src/hooks/useContextMenu.js
index 8d8aed35..8eb4d69e 100644
--- a/src/hooks/useContextMenu.js
+++ b/src/hooks/useContextMenu.js
@@ -644,7 +644,7 @@ export function useContextMenu() {
                     })
                     return
                   }
-
+                  resetModule()
                   addPopup(popupId, 1, <PanelEdit id={popupId} type={PANEL_EDIT_TYPE.COLUMN_MOVE} />)
                 },
               },
@@ -660,7 +660,7 @@ export function useContextMenu() {
                     })
                     return
                   }
-
+                  resetModule()
                   addPopup(popupId, 1, <PanelEdit id={popupId} type={PANEL_EDIT_TYPE.COLUMN_COPY} />)
                 },
                 // component: <PanelEdit id={popupId} type={PANEL_EDIT_TYPE.COLUMN_COPY} />,
@@ -703,7 +703,7 @@ export function useContextMenu() {
                     })
                     return
                   }
-
+                  resetModule()
                   addPopup(popupId, 1, <PanelEdit id={popupId} type={PANEL_EDIT_TYPE.ROW_MOVE} />)
                 },
                 // component: <PanelEdit id={popupId} type={PANEL_EDIT_TYPE.ROW_MOVE} />,
@@ -720,7 +720,7 @@ export function useContextMenu() {
                     })
                     return
                   }
-
+                  resetModule()
                   addPopup(popupId, 1, <PanelEdit id={popupId} type={PANEL_EDIT_TYPE.ROW_COPY} />)
                 },
                 // component: <PanelEdit id={popupId} type={PANEL_EDIT_TYPE.ROW_COPY} />,
@@ -785,6 +785,7 @@ export function useContextMenu() {
                     return
                   }
 
+                  resetModule()
                   alignModule(MODULE_ALIGN_TYPE.HORIZONTAL, currentObject.arrayData ?? [currentObject])
                 },
               },