Shifting issue for side-by-side view in change tab on Merge Request page

In Merge Request Page when you click side-by-side view in Changes it takes full width. Now when you switch between the tabs the shift is visible and it feels annoying. Please check the gif.

It is done intentionally and a better solution than the previous one we had. Need some suggestions from UX team on how to get rid of the shift. /cc @awhildy @cperessini @hazelyang @dimitrieh @tauriedavis @mikegreiling