Yes, you're right. The major things that have worked for me are only working on the top 1 or 2 things of the day and closing my emails. It takes a lot of discipline but only checking emails at specific times of the day make a big difference in terms of my distraction.