diff --git a/frontend/src/metabase/admin/datamodel/components/database/ColumnItem.jsx b/frontend/src/metabase/admin/datamodel/components/database/ColumnItem.jsx
index 20b4f0b6295bf5aa743c3e4e50f29fc63851e072..9fc7c0f352612dbfc04fd04d6443d5d439d3d252 100644
--- a/frontend/src/metabase/admin/datamodel/components/database/ColumnItem.jsx
+++ b/frontend/src/metabase/admin/datamodel/components/database/ColumnItem.jsx
@@ -219,6 +219,7 @@ export class SpecialTypeAndTargetPicker extends Component {
           optionValueFn={o => o.id}
           optionSectionFn={o => o.section}
           placeholder={t`Select a special type`}
+          searchProp="name"
         />
         {showCurrencyTypeSelect && selectSeparator}
         {// TODO - now that we have multiple "nested" options like choosing a
@@ -252,6 +253,7 @@ export class SpecialTypeAndTargetPicker extends Component {
           <Select
             className={cx("TableEditor-field-target text-wrap", className)}
             placeholder={t`Select a target`}
+            searchProp="name"
             value={field.fk_target_field_id}
             onChange={this.handleChangeTarget}
             options={idfields}