issue #20734: Get return selected working