diff --git a/Assets/Cryville.EEW.Unity/Map/MapElementManager.cs b/Assets/Cryville.EEW.Unity/Map/MapElementManager.cs
index f3cd37e..d02b198 100644
--- a/Assets/Cryville.EEW.Unity/Map/MapElementManager.cs
+++ b/Assets/Cryville.EEW.Unity/Map/MapElementManager.cs
@@ -23,6 +23,7 @@ namespace Cryville.EEW.Unity.Map {
 		readonly List<int> _displayingOrder = new();
 
 		public int Count => _displayingReports.Count;
+		public int OngoingCount => _displayingReports.Count - (_selected != null ? 1 : 0);
 
 		[SerializeField] MapElementManager m_subManager;
 
diff --git a/Assets/Cryville.EEW.Unity/Worker.cs b/Assets/Cryville.EEW.Unity/Worker.cs
index 492f3fa..9421c12 100644
--- a/Assets/Cryville.EEW.Unity/Worker.cs
+++ b/Assets/Cryville.EEW.Unity/Worker.cs
@@ -167,7 +167,7 @@ namespace Cryville.EEW.Unity {
 				Debug.LogError(e);
 			_ongoingReportManager.Report(e);
 			_uiActionQueue.Enqueue(() => {
-				if (m_mapElementManager.Count == 0) {
+				if (m_mapElementManager.OngoingCount == 0) {
 					m_mapElementManager.SetSelected(e);
 					m_cameraController.OnMapElementUpdated();
 				}