Fix'd keyboard nav bug