diff --git a/module/handler/enemy_searching.py b/module/handler/enemy_searching.py
index a821888ab..96adc3f31 100644
--- a/module/handler/enemy_searching.py
+++ b/module/handler/enemy_searching.py
@@ -121,6 +121,8 @@ class EnemySearchingHandler(InfoHandler):
             if self.handle_in_stage():
                 return True
             if self.handle_auto_search_exit(drop=drop):
+                timeout.limit = 10
+                timeout.reset()
                 continue
 
             # Popups
@@ -148,6 +150,7 @@ class EnemySearchingHandler(InfoHandler):
                 if appeared:
                     self.handle_enemy_flashing()
                     self.device.sleep(0.3)
+                    self.device.screenshot()
                     logger.info('Enemy searching appeared.')
                     break
                 self.enemy_searching_color_initial()
@@ -155,7 +158,6 @@ class EnemySearchingHandler(InfoHandler):
                 logger.info('Enemy searching timeout.')
                 break
 
-        self.device.screenshot()
         return True
 
     def handle_in_map_no_enemy_searching(self, drop=None):
@@ -173,15 +175,15 @@ class EnemySearchingHandler(InfoHandler):
         while 1:
             self.device.screenshot()
 
-            # End
-            if timeout.reached():
-                break
+            if not self.is_in_map():
+                timeout.reset()
 
             # Stage might ends,
             # although here expects an enemy searching animation.
             if self.handle_in_stage():
                 return True
             if self.handle_auto_search_exit(drop=drop):
+                timeout.reset()
                 continue
 
             # Popups
@@ -198,4 +200,9 @@ class EnemySearchingHandler(InfoHandler):
                 timeout.reset()
                 continue
 
+            # End
+            if timeout.reached():
+                logger.info('No enemy searching in map.')
+                break
+
         return True