Fixed widget selection recursion