diff --git a/src/app/core/constants/nav-items.constant.ts b/src/app/core/constants/nav-items.constant.ts
index 6f389832e..781031d38 100644
--- a/src/app/core/constants/nav-items.constant.ts
+++ b/src/app/core/constants/nav-items.constant.ts
@@ -64,7 +64,7 @@ export const PROJECT_MENU_ITEMS: CustomMenuItem[] = [
     label: 'navigation.registrations',
     routerLink: 'registrations',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'project-contributors',
@@ -72,7 +72,7 @@ export const PROJECT_MENU_ITEMS: CustomMenuItem[] = [
     routerLink: 'contributors',
     visible: true,
     requiredPermission: UserPermissions.Read,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'project-analytics',
@@ -87,14 +87,14 @@ export const PROJECT_MENU_ITEMS: CustomMenuItem[] = [
     routerLink: 'addons',
     visible: true,
     requiredPermission: UserPermissions.Write,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'project-linked-services',
     label: 'navigation.linkedServices',
     routerLink: 'links',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'project-settings',
@@ -102,7 +102,7 @@ export const PROJECT_MENU_ITEMS: CustomMenuItem[] = [
     routerLink: 'settings',
     visible: true,
     requiredPermission: UserPermissions.Read,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
 ];
 
diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
index 305f2d0ba..c74bdb3ba 100644
--- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
@@ -57,15 +57,15 @@ <h3>{{ 'settings.addons.configureAddon.selectFolder' | translate }}</h3>
           @let itemId = folder.itemId || '/';
           @let isLinkDisabled = !folder.mayContainRootCandidates || folder.itemType !== StorageItemType.Folder;
           <div class="folders-table-row relative">
-            <div class="flex gap-2 flex-1">
-              <div tabindex="0" class="flex align-items-center gap-2">
+            <div class="flex gap-2 flex-1 max-w-full">
+              <div tabindex="0" class="flex align-items-center gap-2 w-11">
                 <i class="{{ folder.itemType === StorageItemType.Folder ? 'fas fa-folder' : 'fas fa-file' }}"></i>
                 @if (isLinkDisabled) {
-                  <span class="folder-link-disabled">{{ folder.itemName }}</span>
+                  <span class="folder-link-disabled overflow-ellipsis">{{ folder.itemName }}</span>
                 } @else {
                   <a
                     tabindex="0"
-                    class="cursor-pointer folder-link"
+                    class="cursor-pointer folder-link overflow-ellipsis"
                     (keydown.enter)="
                       handleCreateOperationInvocation(
                         operationName,
diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss
index 34d2c911b..8095b1fe3 100644
--- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss
@@ -3,7 +3,6 @@
 .folders-table {
   min-width: 100%;
   border-radius: mix.rem(8px);
-  overflow-x: auto;
   border: 1px solid var(--grey-2);
 
   &-heading {
@@ -20,7 +19,6 @@
     height: mix.rem(44px);
     border-bottom: 1px solid var(--grey-2);
     padding: 0 mix.rem(27px);
-    min-width: max-content;
 
     .folder-link {
       color: var(--dark-blue-1);
diff --git a/src/app/shared/components/files-tree/files-tree.component.html b/src/app/shared/components/files-tree/files-tree.component.html
index 1aaebab6e..a89cd762d 100644
--- a/src/app/shared/components/files-tree/files-tree.component.html
+++ b/src/app/shared/components/files-tree/files-tree.component.html
@@ -56,13 +56,13 @@
                 <div class="flex gap-2 table-cell" [class.pl-6]="foldersStack.length">
                   @if (file.kind !== 'folder') {
                     <div
-                      class="flex gap-2 min-w-0 hover:underline py-1"
+                      class="flex align-items-center gap-2 min-w-0 hover:underline py-1"
                       (click)="openEntry($event, file)"
                       (keydown.enter)="openEntry($event, file)"
                       tabindex="0"
                     >
                       <i class="fas fa-file blue-icon"></i>
-                      <span class="entry-title blue-text">{{ file?.name ?? '' }}</span>
+                      <span class="entry-title">{{ file?.name ?? '' }}</span>
                     </div>
                   } @else {
                     <div
diff --git a/src/app/shared/components/files-tree/files-tree.component.scss b/src/app/shared/components/files-tree/files-tree.component.scss
index d5547684f..1f8717430 100644
--- a/src/app/shared/components/files-tree/files-tree.component.scss
+++ b/src/app/shared/components/files-tree/files-tree.component.scss
@@ -58,14 +58,6 @@
   max-width: 100%;
 }
 
-.blue-text {
-  color: var(--primary-blue-1);
-
-  &:hover {
-    color: var(--primary-blue-3);
-  }
-}
-
 .tree-table {
   .p-tree {
     padding: 0;
diff --git a/src/styles/overrides/tree.scss b/src/styles/overrides/tree.scss
index f02ff337a..e30a4f1e8 100644
--- a/src/styles/overrides/tree.scss
+++ b/src/styles/overrides/tree.scss
@@ -52,7 +52,12 @@
 
     .p-tree-node-selected {
       .files-table-row {
-        background: var(--bg-blue-3);
+        color: var(--white);
+        background: var(--pr-blue-1);
+
+        .blue-icon {
+          color: var(--white);
+        }
       }
     }
   }