diff --git a/packages/ui/src/components/DropdownLabelsIntl.svelte b/packages/ui/src/components/DropdownLabelsIntl.svelte
index 8b08b353093..fd5366b4595 100644
--- a/packages/ui/src/components/DropdownLabelsIntl.svelte
+++ b/packages/ui/src/components/DropdownLabelsIntl.svelte
@@ -43,6 +43,7 @@
   export let focusIndex: number = -1
   export let dataId: string | undefined = undefined
   export let noFocus: boolean = false
+  export let withSearch: boolean = false
 
   let container: HTMLElement
   let opened: boolean = false
@@ -58,7 +59,7 @@
   function openPopup () {
     if (!opened) {
       opened = true
-      showPopup(DropdownLabelsPopupIntl, { items, selected, params }, container, (result) => {
+      showPopup(DropdownLabelsPopupIntl, { items, selected, params, withSearch }, container, (result) => {
         if (result) {
           selected = result
           dispatch('selected', result)
diff --git a/packages/ui/src/components/DropdownLabelsPopupIntl.svelte b/packages/ui/src/components/DropdownLabelsPopupIntl.svelte
index 6e1f1a8ee3d..b9ed3eea960 100644
--- a/packages/ui/src/components/DropdownLabelsPopupIntl.svelte
+++ b/packages/ui/src/components/DropdownLabelsPopupIntl.svelte
@@ -14,37 +14,85 @@
 -->
 <script lang="ts">
   import { createEventDispatcher } from 'svelte'
+  import { IntlString, translate } from '@hcengineering/platform'
+
   import type { DropdownIntlItem } from '../types'
   import IconCheck from './icons/Check.svelte'
   import Label from './Label.svelte'
-  import { Icon, resizeObserver } from '..'
+  import { deviceOptionsStore, EditWithIcon, Icon, IconSearch, languageStore, resizeObserver } from '..'
+  import ui from '../plugin'
 
   export let items: DropdownIntlItem[]
   export let selected: DropdownIntlItem['id'] | undefined = undefined
   export let params: Record<string, any> = {}
+  export let withSearch: boolean = false
+  export let searchPlaceholder: IntlString = ui.string.Search
 
   const dispatch = createEventDispatcher()
-  const btns: HTMLButtonElement[] = []
+  let btns: HTMLButtonElement[] = []
 
-  const keyDown = (ev: KeyboardEvent, n: number): void => {
+  const keyDown = (ev: KeyboardEvent, n?: number): void => {
     if (ev.key === 'ArrowDown') {
-      if (n === btns.length - 1) btns[0].focus()
+      ev.stopPropagation()
+      ev.preventDefault()
+      if (n === undefined || n === btns.length - 1) btns[0].focus()
       else btns[n + 1].focus()
     } else if (ev.key === 'ArrowUp') {
-      if (n === 0) btns[btns.length - 1].focus()
+      ev.stopPropagation()
+      ev.preventDefault()
+      if (n === undefined || n === 0) btns[btns.length - 1].focus()
       else btns[n - 1].focus()
     }
   }
+
+  let search: string = ''
+  $: lowerSearch = search.toLowerCase()
+
+  async function fillSearchMap (items: DropdownIntlItem[], lang: string): Promise<void> {
+    const result: Record<IntlString, string> = {}
+    for (const item of items) {
+      result[item.label] = (await translate(item.label, item.params, lang)).toLowerCase()
+    }
+    searchMap = result
+  }
+
+  let searchMap: Record<IntlString, string> = {}
+  $: if (withSearch) {
+    void fillSearchMap(items, $languageStore)
+  } else {
+    searchMap = {}
+  }
+
+  $: filteredItems = withSearch ? items.filter((item) => searchMap[item.label]?.includes(lowerSearch)) : items
+  $: btns = btns.slice(0, filteredItems.length)
 </script>
 
-<div class="selectPopup" use:resizeObserver={() => dispatch('changeContent')}>
-  <div class="menu-space" />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
+<div class="selectPopup" use:resizeObserver={() => dispatch('changeContent')} on:keydown={keyDown}>
+  {#if withSearch}
+    <div class="search">
+      <EditWithIcon
+        icon={IconSearch}
+        size={'large'}
+        width={'100%'}
+        autoFocus={!$deviceOptionsStore.isMobile}
+        bind:value={search}
+        on:change={() => dispatch('search', search)}
+        on:input={() => dispatch('search', search)}
+        placeholder={searchPlaceholder}
+      />
+    </div>
+    <div class="menu-separator" />
+  {:else}
+    <div class="menu-space" />
+  {/if}
   <div class="scroll">
     <div class="box">
-      {#each items as item, i}
+      {#each filteredItems as item, i}
         <!-- svelte-ignore a11y-mouse-events-have-key-events -->
         <button
           class="menu-item flex-between"
+          bind:this={btns[i]}
           on:mouseover={(ev) => {
             ev.currentTarget.focus()
           }}
@@ -70,3 +118,10 @@
   </div>
   <div class="menu-space" />
 </div>
+
+<style lang="scss">
+  .search {
+    display: flex;
+    padding: 0.5rem 0.5rem 0 0.5rem;
+  }
+</style>
diff --git a/plugins/setting-resources/src/components/EditEnum.svelte b/plugins/setting-resources/src/components/EditEnum.svelte
index 0594aa5a3cf..01d38f09e0b 100644
--- a/plugins/setting-resources/src/components/EditEnum.svelte
+++ b/plugins/setting-resources/src/components/EditEnum.svelte
@@ -181,8 +181,10 @@
 
   function showConfirmationDialog (): void {
     const isEnumEmpty = values.length === 0
+    const oldValues = value?.enumValues ?? []
+    const isEnumSame = values.length === oldValues.length && values.every((it, i) => it === oldValues[i])
 
-    if (isEnumEmpty) {
+    if (isEnumEmpty || isEnumSame) {
       dispatch('close')
     } else {
       showPopup(
diff --git a/plugins/setting-resources/src/components/typeEditors/RefEditor.svelte b/plugins/setting-resources/src/components/typeEditors/RefEditor.svelte
index 0c25417648d..6662ef20757 100644
--- a/plugins/setting-resources/src/components/typeEditors/RefEditor.svelte
+++ b/plugins/setting-resources/src/components/typeEditors/RefEditor.svelte
@@ -79,7 +79,15 @@
   <Label label={core.string.Class} />
 </span>
 {#if editable}
-  <DropdownLabelsIntl label={core.string.Class} items={classes} {width} bind:selected={refClass} {kind} {size} />
+  <DropdownLabelsIntl
+    label={core.string.Class}
+    items={classes}
+    {width}
+    bind:selected={refClass}
+    {kind}
+    {size}
+    withSearch
+  />
 {:else if selected}
   <Label label={selected.label} />
 {/if}