diff --git a/src/components/analysis/simulation/AnalysimuationInfo.js b/src/components/analysis/simulation/AnalysimuationInfo.js
index 71442ec..95b65d3 100644
--- a/src/components/analysis/simulation/AnalysimuationInfo.js
+++ b/src/components/analysis/simulation/AnalysimuationInfo.js
@@ -32,8 +32,23 @@ export const AnalysimuationInfo = props => {
 
   return (
     <div className='layer-content drone-list'>
-      {props.count === 0 ? (
-        <div className='no-dataTable'>표시할 데이터가 없습니다.</div>
+      {!props.data ? (
+        <>
+          <div className='no-dataTable'>표시할 데이터가 없습니다.</div>
+          {loading && (
+            <div
+              style={{
+                display: 'flex',
+                justifyContent: 'center',
+                flexDirection: 'column',
+                alignItems: 'center'
+              }}
+            >
+              <Spinner color='primary' />
+              <span>Loading...</span>
+            </div>
+          )}
+        </>
       ) : (
         <>
           {props.data
@@ -47,8 +62,12 @@ export const AnalysimuationInfo = props => {
               if (item.idntfNum) {
                 return (
                   <div
-                    className='layer-content-list'
-                    onClick={() => props.handlerDetail(item.cntrlId)}
+                    className={`layer-content-list ${
+                      item.cntrlId === props.cntrlId ? 'on' : ''
+                    }`}
+                    onClick={() => {
+                      props.handlerDetail(item.cntrlId);
+                    }}
                     key={Math.random()}
                   >
                     <dl>
diff --git a/src/containers/analysis/simulator/AnalysisSimulationContainer.js b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
index 4a770b9..a48e257 100644
--- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js
+++ b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
@@ -37,6 +37,8 @@ export const AnalysisSimulationContainer = props => {
 
   const [searchText, setSearchText] = useState('');
 
+  const [cntrlId, setCntrlId] = useState('');
+
   const [sliderVal, setSliderVal] = useState({
     maxVal: 0,
     minVal: 0
@@ -159,11 +161,12 @@ export const AnalysisSimulationContainer = props => {
   };
 
   const handlerDetail = id => {
-    setOpenReportList(false);
+    // setOpenReportList(false);
     handlerDetailSearch(id);
     handlerLogSearch(id);
     handlerStcsSearch(id);
     setOpenDetail(true);
+    setCntrlId(id);
   };
   const handlerLogout = () => {
     dispatch(Action.logout.request());
@@ -210,6 +213,7 @@ export const AnalysisSimulationContainer = props => {
             count={count}
             handlerDetail={handlerDetail}
             handlerPageList={handlerPageList}
+            cntrlId={cntrlId}
           />
         </div>
       ) : (