Yeah, that gets annoying. You can sort of fix it though. Select the branch, go to properties and check 'display origin' then you can see the problem with rotation. I can't find a way to move the origin with the mouse, but open the Joint Editor window and you'll see three boxes under "center point'. Fiddle those numbers while watching the screen.