Wrap keyboard traversal and re-enter… — Code review | OneNoughtOne