Hack to partialy fix focus issues