Only restore on first window - addresses #4