#4529 custom widget fix