Properly persist watch tree state before property edit