Fixing widget behavior