Fix WL-2963

An addition to the fix of WL-2963 to adjust for the tool popup property.