Semi-fix issue with ghost focus