What's the secret to keeping the mashed potato topping from sinking into the filling when baking?

[alexalbon23]

Every time I make shepherd's pie, my mashed potato layer always sinks into the meat filling, and I end up with a strange mix of potato and meat instead of a clean layer. Is there a trick to keeping them separate? Maybe my potatoes are too soft?