Correct bug: when closing window, links disapeared (refs #3944)
Merge pull request #841 from thingthing/3.2-I3944

Correct bug: when closing window, links disapeared (fixes #3944)