Fixed widget selection

Refs #129 @ 1h