Fix for focus change on click