diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index a9679b74..d4bc17b9 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -306,6 +306,7 @@ export default function CanvasMenu(props) {
   const settingsModalOptions = useRecoilState(settingModalFirstOptionsState)
 
   useEffect(() => {
+    console.log(selectedMenu)
     if (selectedMenu === 'placement') {
       onClickPlacementInitialMenu()
     }
@@ -313,8 +314,9 @@ export default function CanvasMenu(props) {
       const moduleSurfacesArray = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
       if (moduleSurfacesArray.length > 0) {
         moduleSurfacesArray.forEach((moduleSurface) => {
-          moduleSurface.modules = []
+          canvas.remove(...moduleSurface.modules)
           canvas.remove(moduleSurface)
+          moduleSurface.modules = []
         })
         canvas.renderAll()
       }
@@ -420,7 +422,7 @@ export default function CanvasMenu(props) {
 
   const checkMenuState = (menu) => {
     return (
-      (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'surface') ||
+      (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'outline') ||
       (selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type))
     )
   }
@@ -540,7 +542,7 @@ export default function CanvasMenu(props) {
                 key={`canvas-menu-${menu.type}`}
                 className={`canvas-menu-item ${selectedMenu === menu.type ? 'active' : ''}`}
                 onClick={async () => {
-                  if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'surface') return
+                  if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'outline') return
                   if (selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type)) return
                   await onClickNav(menu)
                 }}