BS-2644
Fix disposed widget