Really fix widget focus on rerender

Auditors: alex