Fix focus handling on manual trigger (part2)