I've been having that same issue. DOesn't matter if I'm in my shuttle or a ship, I always end up in the shuttle.