Fix <C-x> losing focus on current buffer on some cases