diff --git a/Composer/packages/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts
index 7dd5647f0a..7c45c0b2fd 100644
--- a/Composer/packages/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts
+++ b/Composer/packages/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts
@@ -98,7 +98,7 @@ describe('resolveFieldWidget', () => {
         enum: ['one', 'two', 'three'],
       };
 
-      const { field: ReturnedField } = resolveFieldWidget({ schema });
+      const { field: ReturnedField } = resolveFieldWidget({ schema, isOneOf: true });
       expect(ReturnedField).toEqual(DefaultFields.SelectField);
     });
   });
diff --git a/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
index 4b510dd410..6bf79fa729 100644
--- a/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
@@ -11,6 +11,7 @@ const IntellisenseNumberFieldWithIcon = WithTypeIcons(DefaultFields.Intellisense
 const NumberFieldWithIcon = WithTypeIcons(DefaultFields.NumberField);
 const BooleanFieldWithIcon = WithTypeIcons(DefaultFields.BooleanField);
 const JsonFieldWithIcon = WithTypeIcons(DefaultFields.JsonField);
+const SelectFieldWithIcon = WithTypeIcons(DefaultFields.SelectField);
 const IntellisenseJSONFieldWithIcon = WithTypeIcons(DefaultFields.IntellisenseJSONField);
 const IntellisenseExpressionFieldWithIcon = WithTypeIcons(DefaultFields.IntellisenseExpressionField);
 
@@ -79,7 +80,7 @@ export function resolveFieldWidget(params: {
     }
 
     if (Array.isArray(schema.enum)) {
-      return { field: DefaultFields.SelectField };
+      return { field: isOneOf ? DefaultFields.SelectField : SelectFieldWithIcon };
     }
 
     switch (schema.type) {