diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_finder-leaf.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_finder-leaf.scss
index 9c51752f95..bc16983b6a 100644
--- a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_finder-leaf.scss
+++ b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_finder-leaf.scss
@@ -71,9 +71,9 @@
     }
 
     &__name {
-        white-space: nowrap;
+        display: flex;
+        align-items: center;
         overflow: hidden;
-        text-overflow: ellipsis;
         font-size: $ibexa-text-font-size-medium;
         line-height: calculateRem(21px);
         color: $ibexa-color-dark;
@@ -84,6 +84,12 @@
         }
     }
 
+    &__name-content {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+
     &__icon-wrapper {
         position: relative;
         margin-right: calculateRem(24px);
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.leaf.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.leaf.js
index da873b0c54..c442185ee4 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.leaf.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.leaf.js
@@ -75,16 +75,18 @@ const FinderLeaf = ({ location }) => {
     return (
         <div className={className} onClick={markLocation}>
             {renderToggleSelection()}
-            <span className="c-finder-leaf__name">
+            <span
+                className="c-finder-leaf__name"
+                title={location.ContentInfo.Content.TranslatedName}
+                data-tooltip-container-selector=".c-udw-tab"
+            >
                 <span className="c-finder-leaf__icon-wrapper">
                     <Icon
                         extraClasses="ibexa-icon--small-medium ibexa-icon--base-dark"
                         customPath={contentTypesMap[location.ContentInfo.Content.ContentType._href].thumbnail}
                     />
                 </span>
-                <span title={location.ContentInfo.Content.TranslatedName} data-tooltip-container-selector=".c-udw-tab">
-                    {location.ContentInfo.Content.TranslatedName}
-                </span>
+                <span className="c-finder-leaf__name-content">{location.ContentInfo.Content.TranslatedName}</span>
                 {location.hidden && <Icon name="visibility-hidden" extraClasses="ibexa-icon--small-medium c-finder-leaf__hidden-icon" />}
             </span>
         </div>
diff --git a/src/lib/Behat/Component/IbexaDropdown.php b/src/lib/Behat/Component/IbexaDropdown.php
index 3f90899b4b..f140ab830a 100644
--- a/src/lib/Behat/Component/IbexaDropdown.php
+++ b/src/lib/Behat/Component/IbexaDropdown.php
@@ -35,7 +35,8 @@ protected function specifyLocators(): array
     public function selectOption(string $value): void
     {
         $dropdownOptionLocator = $this->getLocator('ibexaDropdownExtended');
-        $listElement = $this->getHTMLPage()
+        $listElement = $this->getHTMLPage()->setTimeout(5)
+            ->waitUntilCondition(new ElementExistsCondition($this->getHTMLPage(), $dropdownOptionLocator))
             ->findAll($dropdownOptionLocator)
             ->getByCriterion(new ElementTextCriterion($value));
         usleep(2000000);