diff --git a/src/frontend/src/components/settings/SettingList.tsx b/src/frontend/src/components/settings/SettingList.tsx
index c94fcae01d..e531fbf4f7 100644
--- a/src/frontend/src/components/settings/SettingList.tsx
+++ b/src/frontend/src/components/settings/SettingList.tsx
@@ -49,12 +49,12 @@ export function SettingList({
 
   // Determine the field type of the setting
   const fieldType = useMemo(() => {
-    if (setting?.type != undefined) {
-      return setting.type;
+    if (setting?.choices?.length) {
+      return 'choice';
     }
 
-    if (setting?.choices != undefined && setting.choices.length > 0) {
-      return 'choice';
+    if (setting?.type != undefined) {
+      return setting.type;
     }
 
     return 'string';