Class name issues resulting in `hide-preferences-window` not removed #1983