diff --git a/mrpg/core/game.py b/mrpg/core/game.py
index 6460829..8f2fe0e 100644
--- a/mrpg/core/game.py
+++ b/mrpg/core/game.py
@@ -96,10 +96,12 @@ def battle_menu_choice(self, choice):
         self.battle.b.ai()
         assert self.battle.turn is None
         self.battle.turn = Turn(self.battle)
-        self.progress_battle()
+        self.progress()
 
-    def progress_battle(self):
-        if self.battle.is_over():
+    def progress(self):
+        if self.adventure and not self.battle:
+            self.progress_adventure()
+        elif self.battle.is_over():
             self.end_battle()
         elif self.battle.turn:
             try:
@@ -128,7 +130,7 @@ def end_battle(self):
             self.put_output(out)
 
         if self.adventure:
-            self.progress_adventure()
+            self.progress()
         else:
             self.set_state(State.GAME_MENU)
 
diff --git a/mrpg/gui/controller.py b/mrpg/gui/controller.py
index 97e4972..379e1fb 100644
--- a/mrpg/gui/controller.py
+++ b/mrpg/gui/controller.py
@@ -75,7 +75,7 @@ def progress_to_output(self):
         if output:
             return output
         while self.game.battle and self.game.battle.turn:
-            self.game.progress_battle()
+            self.game.progress()
             output = self.resolve_to_output()
             if output:
                 return output