Fix focus regression described in #38