[SHELL32] Follow-up of #2076 (#2091)