Dual Monitor While in Editor Unity 5.4.0

While editing in Unity I have the Game screen on one monitor and the rest of the unity editor on another screen. Before updating to 5.4.0 everything worked fine, now the screen tends to ‘flicker’ when editing things. The game screen will look fine at first but then when I try to move something in the Scene tab, the game screen almost zooms in and relocates the camera in the Scene tab. Has anyone come up with a fix for this?

This unusually strange have you tried reinstalling or checking which monitor is your main one?