fix initial focus bug, until next LT release