Fixed annoying keyboard focus issues