diff --git a/modules/ui/form_fields.js b/modules/ui/form_fields.js
index ae6774d7c..9c8c15497 100644
--- a/modules/ui/form_fields.js
+++ b/modules/ui/form_fields.js
@@ -113,9 +113,7 @@ export function uiFormFields(context) {
                     var field = d.field;
                     field.show();
                     selection.call(formFields);  // rerender
-                    if (field.type !== 'semiCombo' && field.type !== 'multiCombo' && field.type !== 'manyCombo') {
-                        field.focus();
-                    }
+                    field.focus();
                 })
             );