diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js
index 617f17165..ef5c21d5b 100644
--- a/packages/common/business_components/src/ui/map/Gis.js
+++ b/packages/common/business_components/src/ui/map/Gis.js
@@ -20,7 +20,22 @@ import GisApp from './lib/gis.core';
 export const GisContext = createContext({ gisCore: null, gisMap: null, treeData: null, checkedLayerIds: null });
 export const useGisContext = () => useContext(GisContext);
 
-function Gis({ isOpen, gisMaps, isSearchModalOpen, treeData = [], isSearch = false, isMiniMap = false, setIsOpen, setFeatureData, featureData, searchView: SearchView, detailView: DetailView, onFeatureSelect, setIsSearchModalOpen }) {
+function Gis({
+	isOpen,
+	gisMaps,
+	isSearchModalOpen,
+	treeData = [],
+	isSearch = false,
+	isMiniMap = false,
+	setIsOpen,
+	setFeatureData,
+	featureData,
+	searchView: SearchView,
+	detailView: DetailView,
+	onFeatureSelect,
+	setIsSearchModalOpen,
+	onCheckedLayersChange
+}) {
 	const mapRef = useRef();
 	const [mapObject, setMapObject] = useState({});
 	const [tabVisible, setTabVisible] = useState(true);
@@ -146,7 +161,7 @@ function Gis({ isOpen, gisMaps, isSearchModalOpen, treeData = [], isSearch = fal
 
 		gisMaps.current = map
 
-		//미니맵
+		// 미니맵 추가
 		if (isMiniMap) {
 			const overviewMap = new OverviewMap({
 				layers: [GisApp.Module.core.baseMiniMapLayers['base']],
@@ -340,29 +355,40 @@ function Gis({ isOpen, gisMaps, isSearchModalOpen, treeData = [], isSearch = fal
 			<GisContext.Provider value={{ gisCore, gisMap: mapInstanceRef.current, treeData, checkedLayerIds }}>
 				<div className="h-[calc(100vh-10rem)] flex relative">
 					<div ref={mapRef} className="gis-map flex-1 relative" style={{ height: '100%', padding: 0 }} />
-					<GisTree visible={tabVisible} setVisible={setTabVisible} />
+					<GisTree
+						visible={tabVisible}
+						setVisible={setTabVisible}
+						onCheckedChange={handleCheckedLayersChange}
+						onLayerIconClick={(nodeNm) => {
+							setLayerNm(nodeNm); setIsOpen(true); const dummyFeature = {
+								getProperties: () => ({}),  // 최소 구조
+							};
+							onFeatureSelect(dummyFeature);
+						}}
+					/>
 
 					{/* <GisContent onFeatureSelect={handleFeatureSelect} isSearch={isSearch} isSearchModalOpen={isSearchModalOpen} setIsSearchModalOpen={setIsSearchModalOpen} /> */}
 
-					{/* isSearchModalOpen이 true면 visible=false로 팝업 숨김 */}
-					{isOpen && featureData && !isSearchModalOpen && (
+					{/* DetailView가 존재할 때만 렌더링 isSearchModalOpen이 true면 visible=false로 팝업 숨김 */}
+					{isOpen && !isSearchModalOpen && (
 						<DetailView
 							featureData={featureData || { getProperties: () => ({}) }}
 							seletectedLayerNm={layerNm}
 							onClose={closePopup} // 닫기 콜백 전달
 						/>
 					)}
-					{SearchView &&(
-					<SearchView
-						open={isSearchModalOpen}
-						onOpenChange={setIsSearchModalOpen}
-						onFeatureSelect={onFeatureSelect}
-					/>
+					{/* SearchView가 존재할 때만 렌더링 */}
+					{SearchView && (
+						<SearchView
+							open={isSearchModalOpen}
+							onOpenChange={setIsSearchModalOpen}
+							onFeatureSelect={handleFeatureSelect}
+						/>
 					)}
 					<GisLonLat />
 					<GisToolBar />
 					<GisMapToggle />
-					<GisSelect onFeatureSelect={onFeatureSelect} />
+					<GisSelect onFeatureSelect={handleFeatureSelect} />
 				</div>
 
 				{isSearch && (