diff --git a/module/combat/auto_search_combat.py b/module/combat/auto_search_combat.py
index 9063b53f4..5e6689e51 100644
--- a/module/combat/auto_search_combat.py
+++ b/module/combat/auto_search_combat.py
@@ -444,6 +444,13 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
             if self.is_auto_search_running():
                 self._auto_search_status_confirm = False
                 break
+            if self.is_combat_loading():
+                logger.info('Next battle already started')
+                break
+            if self.handle_retirement():
+                self.map_offensive_auto_search()
+                # Map offensive ends at is_combat_loading
+                break
             if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
                 raise CampaignEnd
 
@@ -455,10 +462,10 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
             if self.handle_get_ship():
                 continue
             if not self._sinking and self.handle_auto_search_map_option():
-                self._auto_search_status_confirm = False
                 continue
             # bunch of popup handlers
             if self.handle_popup_confirm('AUTO_SEARCH_COMBAT_STATUS'):
+                self._auto_search_status_confirm = True
                 continue
             if self.handle_urgent_commission():
                 get_urgent_commission = True