diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx
index 983492bf..04dbbcb0 100644
--- a/src/components/floor-plan/modal/basic/BasicSetting.jsx
+++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx
@@ -17,6 +17,7 @@ import {
   currentCanvasPlanState,
   isManualModuleLayoutSetupState,
   isManualModuleSetupState,
+  moduleSetupOptionState,
   toggleManualSetupModeState,
 } from '@/store/canvasAtom'
 import { loginUserStore } from '@/store/commonAtom'
@@ -47,6 +48,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   const [checkedModules, setCheckedModules] = useRecoilState(checkedModuleState)
   const [roofs, setRoofs] = useState(addedRoofs)
   const [manualSetupMode, setManualSetupMode] = useRecoilState(toggleManualSetupModeState)
+  const [moduleSetupOption, setModuleSetupOption] = useRecoilState(moduleSetupOptionState)
   const [layoutSetup, setLayoutSetup] = useState([{}])
   const {
     selectedModules,
@@ -211,8 +213,12 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   }
 
   const handleManualModuleSetup = () => {
-    setManualSetupMode(`manualSetup_${!isManualModuleSetup}`)
-    setIsManualModuleSetup(!isManualModuleSetup)
+    const nextManual = !isManualModuleSetup
+    setManualSetupMode(`manualSetup_${nextManual}`)
+    setIsManualModuleSetup(nextManual)
+    if (nextManual) {
+      setModuleSetupOption((prev) => ({ ...prev, isChidori: true }))
+    }
   }
 
   const handleManualModuleLayoutSetup = () => {