Fixes to control Focus

Fixes to control Focus after selecting a user from the list.