Revert "Focus after swapping"

This reverts commit 852adc8d585bdf7ee0686f033f97cfc89f886995.