Fix focus move (work in progress)