Patch to correct focus on inputs