Attempt to fix bug where reloading persistent streams would break the layout