diff --git a/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
index 6bf79fa729..7a7df04afb 100644
--- a/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
@@ -66,7 +66,9 @@ export function resolveFieldWidget(params: {
       if (value.startsWith('=')) {
         return { field: isOneOf ? DefaultFields.IntellisenseExpressionField : IntellisenseExpressionFieldWithIcon };
       } else {
-        if (showIntellisense && isOneOf) {
+        if (schema.enum?.includes(value)) {
+          return { field: isOneOf ? DefaultFields.SelectField : SelectFieldWithIcon };
+        } else if (showIntellisense && isOneOf) {
           return { field: DefaultFields.IntellisenseTextField };
         } else if (showIntellisense && !isOneOf) {
           return { field: IntellisenseTextFieldWithIcon };