2 files changed, 3 insertions, 2 deletions
diff --git a/rules.js b/rules.js
index d6d704f..8aa76c5 100644
--- a/rules.js
+++ b/rules.js
@@ -1803,7 +1803,6 @@ states.retreat = {
 			if (game.location[b] == game.where && block_owner(b) == game.active)
 				eliminate_block(b, 'retreat');
 		print_turn_log("retreats");
-		clear_undo();
 		goto_regroup();
 	},
 	block: function (who) {
@@ -1855,6 +1854,7 @@ states.retreat_to = {
 	},
 	eliminate: function () {
 		eliminate_block(game.who, 'retreat');
+		game.who = null;
 		game.state = 'retreat';
 	},
 	block: pop_undo,
diff --git a/ui.js b/ui.js
index 75d97a4..506869f 100644
--- a/ui.js
+++ b/ui.js
@@ -101,7 +101,8 @@ function on_blur_map_block(evt) {
 
 function on_click_map_block(evt) {
 	let b = evt.target.block;
-	send_action('block', b);
+	if (!game.battle)
+		send_action('block', b);
 }
 
 function is_battle_reserve(who, list) {