data/classes/game_state.cfg      | 4 ++++
 data/objects/game_controller.cfg | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/data/classes/game_state.cfg b/data/classes/game_state.cfg
index ad14a28..fcf5e49 100644
--- a/data/classes/game_state.cfg
+++ b/data/classes/game_state.cfg
@@ -205,6 +205,10 @@
 		class unit<- unit_at_loc(loc)
 	",

+	unit_avatar_at_loc_or_die: "def(Loc loc) ->obj unit_avatar
+		obj unit_avatar<- unit_at_loc_or_die(loc).avatar_name
+	",
+
 	unit_cast_spell: "def(class unit u, class spell s, [Loc] targets) ->commands
 	if(unit_can_move(u) and u.mana >= s.mana_cost,
 	[
diff --git a/data/objects/game_controller.cfg b/data/objects/game_controller.cfg
index 2df590e..44a8e38 100644
--- a/data/objects/game_controller.cfg
+++ b/data/objects/game_controller.cfg
@@ -837,12 +837,12 @@
 		key_released: "def(string k) ->commands null",

 		screen_lazy_focus_loc: "def(Loc loc) ->commands [
-
 			if(screen_x > target_x-80 or screen_x+SCREEN_WIDTH < target_x+200 or
 			   screen_y > target_y-80 or screen_y+SCREEN_HEIGHT < target_y+80,
 			[
-			   screen_focus_loc(loc),
-			   set(_initial_focus, false),
+				scroll_to(state.unit_avatar_at_loc_or_die(loc)),
+				//screen_focus_loc(loc),
+				set(_initial_focus, false),
 			])

 		] where target_x = tile_mid_x(loc)