FIX Selection handling on focus change