Check your position when using the computer. If the keyboard and mouse are too high, you could be constantly elevating your shoulder. Also, your upper arm should be as close to straight down as possible. Your lower arm supported and perpendicular to the upper arm.
What about shoulder exercises? I know that upright rows were very bad for me (at least the way I was doing them).