diff --git a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs b/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs
new file mode 100644
index 00000000..17b50ebf
--- /dev/null
+++ b/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs
@@ -0,0 +1,20 @@
+using ChunilENG;
+using ChunilENG.Management;
+using ChunilENG.UI;
+using UnityEngine;
+using UVC.UI.Commands;
+
+namespace ChunilENG.UI.Command
+{
+    public class ActiveMachineInfoItemCommand : ICommand
+    {
+        private bool isActive = true;
+        public void Execute(object? parameter = null)
+        {
+            var itemManager = ChunilENGSceneMain.Instance.GetManager<MachineInfoItemManager>();
+            isActive = !isActive;
+            itemManager.ActiveIcons(isActive);
+        }
+    }
+}
+
diff --git a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs.meta b/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs.meta
new file mode 100644
index 00000000..4a9bd4f0
--- /dev/null
+++ b/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: dc27e9cd507dea347ade0e5e30c38bde
\ No newline at end of file
diff --git a/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs b/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs
index 91d3b6b3..0648823b 100644
--- a/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs
+++ b/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs
@@ -125,8 +125,6 @@ namespace ChunilENG.Management
                     return;
                 var targetMachine = machines.Find(m => m.code == data.workcd);
 
-                Debug.Log(machines.Find(m => m.code == "IJ22"));
-
                 if (targetMachine == null) { continue; }
 
                 targetMachine.machineKPI.SetData(data, targetMachine.machineName);
diff --git a/Assets/Scripts/ChunilENG/UI/CameraController/CameraControlItem.cs b/Assets/Scripts/ChunilENG/UI/CameraController/CameraControlItem.cs
index 96126513..18c17c1c 100644
--- a/Assets/Scripts/ChunilENG/UI/CameraController/CameraControlItem.cs
+++ b/Assets/Scripts/ChunilENG/UI/CameraController/CameraControlItem.cs
@@ -11,6 +11,7 @@ namespace ChunilENG.UI
     public class CameraControlItem : MonoBehaviour
     {
         public CameraPoint point;
+        public int floorIndex;
         private Button button;
         public Image SelectImage; // ���� ���¸� ǥ���� �̹���
 
@@ -19,6 +20,8 @@ namespace ChunilENG.UI
         public void SettingButton(int index, CameraPoint point)
         {
             this.point = point;
+            floorIndex = point.floorIndex;
+
             button = GetComponent<Button>();
             var buttonText = GetComponentInChildren<TMP_Text>();
 
@@ -30,7 +33,7 @@ namespace ChunilENG.UI
 
             if (buttonText != null)
             {
-                buttonText.SetText($"Camera {index}");
+                buttonText.SetText(point.name);
             }
 
             button.onClick.AddListener(HandleClick);
diff --git a/Assets/Scripts/ChunilENG/UI/CameraController/CameraControlPanel.cs b/Assets/Scripts/ChunilENG/UI/CameraController/CameraControlPanel.cs
index 23ee595b..93183124 100644
--- a/Assets/Scripts/ChunilENG/UI/CameraController/CameraControlPanel.cs
+++ b/Assets/Scripts/ChunilENG/UI/CameraController/CameraControlPanel.cs
@@ -8,6 +8,7 @@ using ChunilENG.Object;
 using System.Linq;
 using OCTOPUS_TWIN.Constants;
 using ChunilENG.Management;
+using UnityEngine.SceneManagement;
 
 namespace ChunilENG.UI
 {
@@ -18,38 +19,44 @@ namespace ChunilENG.UI
         private readonly List<CameraControlItem> cameraButtons = new List<CameraControlItem>();
         public CameraControlItem cameraControlItem;
 
+        private CameraControlItem selectedCameraControlItem;
+        public bool isSceneReady;
         private void Awake()
         {
             IgnoreSingleOpenMode = true;    
         }
-
         public override async UniTask Init()
         {
-            cameraViewPoints = FindObjectsByType<CameraPoint>(FindObjectsSortMode.None).ToList();
             cameraControlItem = Resources.Load<CameraControlItem>($"{ResourceURL.chunilENGUIPrefabFolderPath}CameraControlItem");
-            SettingButtons();
-
-            //if (SceneManager.GetActiveScene().name == "Chunil")
-            //{
-            //    floorControlPanel = FindFirstObjectByType<FloorControlPanel>(FindObjectsInactive.Include);
-            //    if (floorControlPanel != null)
-            //    {
-            //        floorControlPanel.onValueChanged += FilterItemsByFloor;
-            //        if (floorControlPanel.currentFloorItem != null)
-            //        {
-            //            FilterItemsByFloor(floorControlPanel.currentFloorItem.value);
-            //        }
-            //    }
-            //}
-            //else
-            //{
-            //    FilterItemsByFloor(-1);
-            //}
+            SceneManager.sceneLoaded += OnSceneLoaded;
 
+            //�̹� �ε�� �ʱ� �� ���� ó��
+            RefreshCameraPoints();
             gameObject.SetActive(false);
             await UniTask.CompletedTask;
         }
+        private void OnDestroy()
+        {
+            SceneManager.sceneLoaded -= OnSceneLoaded;
+        }
+        private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+        {
+            RefreshCameraPoints();
+        }
+        private void RefreshCameraPoints()
+        {
+            cameraViewPoints = FindObjectsByType<CameraPoint>(FindObjectsSortMode.None).OrderBy(cp => cp.transform.GetSiblingIndex()).ToList();
+            isSceneReady = cameraViewPoints == null || cameraViewPoints.Count == 0 ? false : true;
 
+            SettingButtons();
+
+            if (selectedCameraControlItem != null)
+            {
+                var point = cameraButtons.Find(x => x.name == selectedCameraControlItem.name).point;
+                CommandManager.Instance.Execute(new ChangedCameraCommand(point));
+                selectedCameraControlItem = null;
+            }
+        }
         public void SettingButtons()
         {
             if (cameraControlItem == null || cameraViewPoints.Count == 0) return;
@@ -73,25 +80,13 @@ namespace ChunilENG.UI
         private void HandleItemClicked(CameraControlItem item)
         {
             var floorControl = ChunilENGSceneMain.Instance.GetManager<ChunilENGUIManager>().GetCanvas<PopupCanvas>().GetPanel<FloorControlPanel>();
-            floorControl.ChangedCurrentFloor(item.point.floorIndex);
+            floorControl.ChangedCurrentFloor(item.floorIndex);
 
-            //if (cameraControlItem != null && cameraControlItem != item)
-            //{
-            //    cameraControlItem.Deselect();
-            //}
-            //cameraControlItem = item;
-            //cameraControlItem.Select();
-            //TODO : ������
-            if(item.point==null)
+            if (!isSceneReady)
             {
-                cameraViewPoints = FindObjectsByType<CameraPoint>(FindObjectsSortMode.None).ToList();
-                int index = 0;
-                foreach (var test in cameraButtons)
-                {
-
-                    test.point = cameraViewPoints[index];
-                    index++;
-                }
+                selectedCameraControlItem = item;
+                Debug.Log("Scene not ready. Camera change deferred.");
+                return;
             }
             CommandManager.Instance.Execute(new ChangedCameraCommand(item.point));
         }
diff --git a/Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs b/Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs
index 6d55e17d..b2e985be 100644
--- a/Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs
+++ b/Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs
@@ -100,7 +100,7 @@ namespace ChunilENG.UI
                 "Prefabs/UI/Toolbar/images/IMG_WallControl_on",
                 "Prefabs/UI/Toolbar/images/IMG_WallControl_off",
                 (isSelected) => Debug.Log($"내/외벽 조절 UI 활성화 상태 : {(isSelected ? "활성화" : "비활성화")} (OnToggle 콜백)"),
-                new ActiveWallControlPanelCommand(),
+                new ActiveMachineInfoItemCommand(),
                 "내/외벽 조절 UI를 활성화/비활성화 합니다.");
 
             // 라이브러리