Save and restore window position when expanding, closes #129