Try harder to handle focus properly, references #95