Fix focus handling on manual trigger