Bugfix: widget switching