diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
index f053a9d06..2985390fb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -168,10 +168,6 @@ public final class MainActivity
 
 		controllers.gameRoundController.resume();
 
-		if (world.model.uiSelections.isInCombat) {
-			controllers.combatController.setCombatSelection(world.model.uiSelections.selectedMonster, world.model.uiSelections.selectedPosition);
-			controllers.combatController.enterCombat(CombatController.BeginTurnAs.continueLastTurn);
-		}
 		updateStatus();
 	}
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
index 50682a739..b1681c61a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
@@ -52,6 +52,11 @@ public final class GameRoundController implements TimedMessageTask.Callback {
 	public void resume() {
 		world.model.uiSelections.isMainActivityVisible = true;
 		roundTimer.start();
+
+		if (world.model.uiSelections.isInCombat) {
+			controllers.combatController.setCombatSelection(world.model.uiSelections.selectedMonster, world.model.uiSelections.selectedPosition);
+			controllers.combatController.enterCombat(CombatController.BeginTurnAs.continueLastTurn);
+		}
 	}
 
 	private void restartWaitForNextFullRound() {