Fix default shift selection on init