Try using magit for a while and being able to be more specific about which window to switch to.

Change-Id: I405847df75476c970ba55e08316f604ebbcab0ec