Better tabfocus flow #12