inconvenient windows splitting behavior, lp:1018996

misplaced `switch-to-buffer' calls removed