diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
index ed39d9548..adf85f1af 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
@@ -107,6 +107,9 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
   };
 
   const closePopup = () => {  // 팝업 닫기
+    setPopupOpen(false);
+  }
+  const infilRsltChart = () => {  // 그래프 & 팝업 닫기
 
     fn.selectInftwtAnlsRslt(selectedInftwtAnls, pplMngNo).then((data) => {// 침입수분석 결과 조회
       const rsltData = fn.getChartDataInftwtAnlsRslt(data ?? []);
@@ -250,6 +253,9 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
           </div>
           <div className="flex justify-end mt-4 space-x-2">
             <button className="px-4 py-2 bg-gray-600 text-white rounded" onClick={closePopup}>
+              닫기
+            </button>
+            <button className="px-4 py-2 bg-gray-600 text-white rounded" onClick={infilRsltChart}>
               분석결과 도표
             </button>
           </div>
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
index 33b65ace0..c6792547f 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
@@ -96,6 +96,9 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
   }, [rainInfwtAnlsSn]);
 
   const closePopup = () => {  // 팝업 닫기
+    setPopupOpen(false);
+  }
+  const rdiiRsltChart = () => {  // 그래프 & 팝업 닫기
     fn.selectRdiiAnlsRslt(rainInfwtAnlsSn, pplMngNo).then((data) => {// 강우유입수분석 결과 조회
       const rsltData1 = fn.getChartDataRdiiAnlsRslt(data ?? []);
       //const rsltData2 = fn.getChartDataRdiiAnlsRsltMinq(data ?? []);
@@ -236,6 +239,9 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
           </div>
           <div className="flex justify-end mt-4 space-x-2">
             <button className="px-4 py-2 bg-gray-600 text-white rounded" onClick={closePopup}>
+              닫기
+            </button>
+            <button className="px-4 py-2 bg-gray-600 text-white rounded" onClick={rdiiRsltChart}>
               분석결과 도표
             </button>
           </div>
diff --git a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
index e40a5bfb6..c0fe5c86e 100644
--- a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
@@ -57,7 +57,7 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
   const getSelectedLayers = () => {
     let result = null;
     const layers = gisMap.getLayers().getArray(); // gisMap에서 모든 레이어 가져오기
-    let featureLayer: { get: (key: string) => any } = { get: (key: string) => null }; // 피처가 속한 레이어를 찾기 위한 변수
+    let featureLayer: { get: (key: string) => any }; // 피처가 속한 레이어를 찾기 위한 변수
     layers.forEach((layer: any) => {
       const source = layer.getSource();
       if (source && source.hasFeature && featureData