Restore per-window handling of panes