I like to use Focus (https://heyfocus.com/) on the Mac to prevent myself from actually doing these context switches.