I came across this but I found it’s not quite how you described it. If you click in the right spot when popping out you can get the correct unit. From memory I think it was in a area where the other invisible units are not. I save my pop out positions using pop out panel manager so once you find the right click spot it always pops out the unit you want.
I agree it needs fixing but this workaround will get you there for now without having to mess with .cfg files.