diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_richtext.js b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_richtext.js
index e11667991b..ae93e8843d 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_richtext.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_richtext.js
@@ -22,7 +22,14 @@ import initValidator from './validator/richtext-validator';
 
             udwRoot.unmount();
         };
-        const mergedConfig = { ...config, onConfirm: confirmHandler, onCancel: cancelHandler };
+        const itemsConfirmHandler = (items) => {
+            if (typeof config.onItemsConfirm === 'function') {
+                config.onItemsConfirm(items);
+            }
+
+            udwRoot.unmount();
+        };
+        const mergedConfig = { ...config, onConfirm: confirmHandler, onCancel: cancelHandler, onItemsConfirm: itemsConfirmHandler };
 
         udwRoot.render(React.createElement(ibexa.modules.UniversalDiscovery, mergedConfig));
     };
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_richtext.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_richtext.html.twig
index 39b437599d..aa8b4c059f 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_richtext.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_richtext.html.twig
@@ -7,6 +7,7 @@
     <div class="hidden" data-udw-config-name="richtext_embed" data-udw-config="{{ ibexa_udw_config('richtext_embed', udw_context) }}"></div>
     <div class="hidden" data-udw-config-name="richtext_embed_image" data-udw-config="{{ ibexa_udw_config('richtext_embed_image', udw_context) }}"></div>
     {%- block richtext_extra_config -%}{%- endblock -%}
+    {{ ibexa_twig_component_group('admin-ui-richtext-config') }}
     <div class="ibexa-data-source__richtext" id="{{ form.vars.id }}__editable"></div>
     <div class="ibexa-richtext-tools">
         <ul class="ibexa-elements-path"></ul>
diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index cd2930a87b..91cd493563 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -293,6 +293,7 @@
         <div class="hidden" data-udw-config-name="richtext_embed" data-udw-config="{{ ibexa_udw_config('richtext_embed', udw_context) }}"></div>
         <div class="hidden" data-udw-config-name="richtext_embed_image" data-udw-config="{{ ibexa_udw_config('richtext_embed_image', udw_context) }}"></div>
         {%- block richtext_extra_config -%}{%- endblock -%}
+        {{ ibexa_twig_component_group('admin-ui-richtext-config') }}
         <div class="ibexa-data-source__richtext" id="{{ form.vars.id }}__editable"></div>
         <div class="ibexa-richtext-tools">
             <ul class="ibexa-elements-path"></ul>