Once you've sorted the clip problem out, a good spray of silicone lubricant down each of the glass guide channels, should help prevent the glass from pulling out of the runners due to friction.
And while you've got the door panel off to reattach the glass, give the mechanism a good spray with...