Persisting selection on collapse