neon-1237 Fixing broken widgets