Preserve toggle state