UI: Toggle fix #2