Fix SelectorWindow with Enums