added hack to get focus change, this should be swapped out with correct impl