diff --git a/src/bundle/Resources/config/services.yaml b/src/bundle/Resources/config/services.yaml
index cf44a0a7da..3b8b489144 100644
--- a/src/bundle/Resources/config/services.yaml
+++ b/src/bundle/Resources/config/services.yaml
@@ -26,7 +26,6 @@ imports:
     - { resource: services/forms.yaml }
     - { resource: services/strategies.yaml }
     - { resource: services/query_types.yaml }
-    - { resource: services/search.yaml }
     - { resource: services/role_form_mappers.yaml }
     - { resource: services/fieldtype_form_mappers.yaml }
     - { resource: services/action_dispatchers.yaml }
diff --git a/src/bundle/Resources/config/services/components.yaml b/src/bundle/Resources/config/services/components.yaml
index 6de3bd5d79..1f59edac4b 100644
--- a/src/bundle/Resources/config/services/components.yaml
+++ b/src/bundle/Resources/config/services/components.yaml
@@ -1,6 +1,7 @@
 imports:
     - { resource: components/content/edit.yaml }
     - { resource: components/content_type/edit.yaml }
+    - { resource: components/layout.yaml }
 
 services:
     _defaults:
diff --git a/src/bundle/Resources/config/services/components/layout.yaml b/src/bundle/Resources/config/services/components/layout.yaml
new file mode 100644
index 0000000000..890079d56c
--- /dev/null
+++ b/src/bundle/Resources/config/services/components/layout.yaml
@@ -0,0 +1,18 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: false
+        public: false
+
+    Ibexa\AdminUi\Component\Search\GlobalSearchTwigComponent:
+        autowire: true
+        public: false
+        tags:
+            - { name: ibexa.admin_ui.component, group: global-search }
+
+    ibexa.admin_ui.component.user_menu:
+        class: Ibexa\AdminUi\Component\TwigComponent
+        arguments:
+            $template: '@@ibexadesign/ui/user_menu.html.twig'
+        tags:
+            - { name: ibexa.admin_ui.component, group: user-menu }
diff --git a/src/bundle/Resources/config/services/search.yaml b/src/bundle/Resources/config/services/search.yaml
deleted file mode 100644
index d38341f8c9..0000000000
--- a/src/bundle/Resources/config/services/search.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  Ibexa\AdminUi\Component\Search\GlobalSearchTwigComponent:
-    autowire: true
-    public: false
-    tags:
-      - { name: ibexa.admin_ui.component, group: global-search }
diff --git a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig
index 09e45451e5..fc642574c4 100644
--- a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig
@@ -134,10 +134,7 @@
                 </div>
                 <div class="ibexa-main-header__user-menu-column">
                     {% block user_menu %}
-                        {{ knp_menu_render('ezplatform_admin_ui.menu.user', {
-                            'depth': 1,
-                            'template': '@ibexadesign/ui/menu/user.html.twig'
-                        }) }}
+                        {{ ibexa_render_component_group('user-menu') }}
                     {% endblock %}
                 </div>
             </header>
diff --git a/src/bundle/Resources/views/themes/admin/ui/user_menu.html.twig b/src/bundle/Resources/views/themes/admin/ui/user_menu.html.twig
new file mode 100644
index 0000000000..d731dd77b7
--- /dev/null
+++ b/src/bundle/Resources/views/themes/admin/ui/user_menu.html.twig
@@ -0,0 +1,4 @@
+{{ knp_menu_render('ezplatform_admin_ui.menu.user', {
+    'depth': 1,
+    'template': '@ibexadesign/ui/menu/user.html.twig'
+}) }}