Fix non-focused columns being autoshifted to