diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index e9e8ebdc..54a83677 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -183,7 +183,7 @@ export default function CanvasMenu(props) {
         await reloadCanvasStatus(objectNo, pid)
         break
       case 'surface':
-        if (selectedMenu > menu.index) {
+        if (['module', 'estimate', 'simulation'].some((menu) => menu === selectedMenu)) {
           const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE)
 
           if (modules.length > 0) {
@@ -223,7 +223,7 @@ export default function CanvasMenu(props) {
         await reloadCanvasStatus(objectNo, pid)
         break
       case 'module':
-        if (selectedMenu < menu.index) {
+        if (['placement', 'outline', 'surface'].some((menu) => menu === selectedMenu)) {
           if (!checkMenuAndCanvasState()) {
             swalFire({ text: getMessage('menu.validation.canvas.roof') })
             return