So, you're extruding faces and edges at once? I'm not sure if I'm misunderstanding the question, but perhaps make sure that Polygons > Tool Options > Keep faces Together is on. If that's not the problem, perhaps you could post an image.