#1557 - Fixed issue with widgets being shown wrong.