diff --git a/src/bundle/Resources/public/js/scripts/core/dropdown.js b/src/bundle/Resources/public/js/scripts/core/dropdown.js
index 17ea6646bd..e0b5df10d1 100644
--- a/src/bundle/Resources/public/js/scripts/core/dropdown.js
+++ b/src/bundle/Resources/public/js/scripts/core/dropdown.js
@@ -3,7 +3,7 @@
     const { dangerouslySetInnerHTML, dangerouslyInsertAdjacentHTML } = ibexa.helpers.dom;
 
     const EVENT_VALUE_CHANGED = 'change';
-    const RESTRICTED_AREA_ITEMS_CONTAINER = 190;
+    const RESTRICTED_AREA_ITEMS_CONTAINER = 90;
     const MINIMUM_LETTERS_TO_FILTER = 3;
 
     class DropdownPopover extends bootstrap.Popover {
diff --git a/src/bundle/Resources/public/scss/_dropdown.scss b/src/bundle/Resources/public/scss/_dropdown.scss
index dabe32511a..436e65ea3d 100644
--- a/src/bundle/Resources/public/scss/_dropdown.scss
+++ b/src/bundle/Resources/public/scss/_dropdown.scss
@@ -108,8 +108,8 @@
         padding-left: calculateRem(8px);
         padding-top: 0;
         padding-bottom: 0;
-        margin-right: calculateRem(8px);
-        max-width: calculateRem(380px);
+        margin-right: calculateRem(6px);
+        max-width: 100%;
         transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;
 
         &--has-icon {
@@ -467,7 +467,8 @@
     &--overflow {
         .ibexa-dropdown {
             &__selected-item {
-                max-width: calc(100% - #{calculateRem(40px)});
+                max-width: calc(100% - #{calculateRem(50px)});
+                transition: none;
             }
         }
     }
diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_filters-panel.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_filters-panel.scss
index 420e40af0c..349c898031 100644
--- a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_filters-panel.scss
+++ b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_filters-panel.scss
@@ -1,3 +1,7 @@
 .c-filters-panel {
     @include c-filters-panel('.c-filters-row');
+
+    .ibexa-btn {
+        margin-left: calculateRem(4px);
+    }
 }
diff --git a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
index d95e9de9e2..5f7f27e1f7 100644
--- a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
+++ b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
@@ -11,7 +11,7 @@ const MIN_SEARCH_ITEMS_DEFAULT = 5;
 const MIN_ITEMS_LIST_HEIGHT = 150;
 const ITEMS_LIST_WIDGET_MARGIN = 8;
 const ITEMS_LIST_SITE_MARGIN = ITEMS_LIST_WIDGET_MARGIN + 4;
-const RESTRICTED_AREA_ITEMS_CONTAINER = 190;
+const RESTRICTED_AREA_ITEMS_CONTAINER = 90;
 
 const Dropdown = ({
     dropdownListRef,
@@ -44,6 +44,7 @@ const Dropdown = ({
         'ibexa-dropdown--small': small,
         'ibexa-dropdown--disabled': disabled,
         'ibexa-dropdown--expanded': isExpanded,
+        'ibexa-dropdown--overflow': overflowItemsCount > 0,
         [extraClasses]: true,
     });
     const toggleExpanded = () => {