FORGE-2160: Checking the current selection instead of the initial one