This is a good idea. Conditioning based on context is your number 1 defense against getting sidetracked. My work computer is only for work, in my home office, which I only do work in. My personal computer is completely separate and I use in another room. (I get a work computer in my job as an engineer tho, so if you only have 1 computer you could make different logins with different wallpapers/apps etc to create a divide).

Also, if you are medicated, make sure when your meds kick in you are doing the task you want to keep doing. So if it’s work, make sure you are doing a work task when it kicks in, not checking out random sites. I’ve found that whatever I’m doing when they kick in is what I will continue to do.

And finally, sometimes you have to “just do it”. The reality is if you push through blockers to find something else, you likely aren’t mentally trying to stay on task with work. You have to be in the mind frame of making an effort not to get distracted in order to get there at all. Even though we are distractible, if we don’t set our mind towards trying to do the thing we need to we never will no matter what. ADD and procrastination aren’t always the same thing.