GUI-337: Another fix to avoid race conditions for chosen widgets in policy statements