#5268: Fix issues with adding widgets after removing widgets.
Merge pull request #6032 from openscholar/5268-fix_adding_widgets

Fix issues with adding widgets after removing widgets.