diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index 12cb0bf8..a8a191b2 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -184,7 +184,8 @@ export default function CanvasMenu(props) {
         promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => {
           if (res.status === 200) {
             const estimateDetail = res.data
-            if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) {
+            // if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) {
+            if (estimateDetail.estimateDate !== null) {
               setMenuNumber(menu.index)
               setCurrentMenu(menu.title)
               setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
@@ -215,9 +216,10 @@ export default function CanvasMenu(props) {
       setMenuNumber(menu.index)
       setCurrentMenu(menu.title)
     }
-
     if (pathname !== '/floor-plan') {
-      if (menu.index !== 0) {
+      // if (menu.index !== 0 ) {
+      //견적서 or 발전시뮬레이션 탭에서 같은 탭 클릭시 화면 이동했다 돌아오지않도록..
+      if (menu.index !== 0 && menu.index !== 5 && menu.index !== 6) {
         router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
       }
     }
@@ -372,39 +374,45 @@ export default function CanvasMenu(props) {
 
   useEffect(() => {
     if (isObjectNotEmpty(estimateRecoilState)) {
-      if (estimateRecoilState?.createUser === 'T01') {
-        if (sessionState.storeId !== 'T01') {
-          setButtonStyle1('none')
-          setButtonStyle2('none')
-          setButtonStyle3('none')
-          setButtonStyle4('none')
-          setButtonStyle5('none')
-        }
-      } else {
-        if (estimateRecoilState?.tempFlg === '1') {
-          setButtonStyle1('none')
-          setButtonStyle2('')
-          setButtonStyle3('none')
-          setButtonStyle4('none')
-          setButtonStyle5('none')
-        } else {
-          if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
-            setButtonStyle1('')
-            setButtonStyle2('')
-            setButtonStyle3('')
-            setButtonStyle4('')
-            setButtonStyle5('')
-          } else {
-            setButtonStyle1('')
+      if (estimateRecoilState?.createUser && estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) {
+        if (estimateRecoilState?.createUser === 'T01') {
+          if (sessionState.storeId !== 'T01') {
+            setButtonStyle1('none')
             setButtonStyle2('none')
             setButtonStyle3('none')
-            setButtonStyle4('')
-            setButtonStyle5('')
+            setButtonStyle4('none')
+            setButtonStyle5('none')
+          }
+        } else {
+          if (isObjectNotEmpty(estimateRecoilState)) {
+            if (estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) {
+              if (estimateRecoilState?.tempFlg === '1') {
+                setButtonStyle1('none')
+                setButtonStyle2('')
+                setButtonStyle3('none')
+                setButtonStyle4('none')
+                setButtonStyle5('none')
+              } else {
+                if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
+                  setButtonStyle1('')
+                  setButtonStyle2('')
+                  setButtonStyle3('')
+                  setButtonStyle4('')
+                  setButtonStyle5('')
+                } else {
+                  setButtonStyle1('')
+                  setButtonStyle2('none')
+                  setButtonStyle3('none')
+                  setButtonStyle4('')
+                  setButtonStyle5('')
+                }
+              }
+            }
           }
         }
       }
     }
-  }, [estimateRecoilState.tempFlg, estimateRecoilState.lockFlg])
+  }, [estimateRecoilState?.createUser, estimateRecoilState?.tempFlg, estimateRecoilState?.lockFlg])
 
   /**
    * 견적서 잠금 / 해제
diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js
index dd3c2739..d9dbfaaa 100644
--- a/src/hooks/usePlan.js
+++ b/src/hooks/usePlan.js
@@ -238,7 +238,9 @@ export function usePlan(params = {}) {
           if (res.status === 200) {
             const estimateDetail = res.data
             if (pathname === '/floor-plan/estimate/5') {
-              if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) {
+              // 견적서 이동 조건 수정
+              // if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) {
+              if (estimateDetail.estimateDate !== null) {
                 res.data.resetFlag = 'N'
 
                 if (res.data.itemList.length > 0) {