diff --git a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.html b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.html
index ab46c56ea4..450f368b5f 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.html
+++ b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.html
@@ -20,7 +20,7 @@
       [endpointDisconnected]="endpointDisconnected"></app-favorites-meta-card>
   </div>
   <ng-container *ngIf="(searchedEntities$ | async) as searchedEntities">
-    <button class="favorite-entity-list__expand-button" *ngIf="searchedEntities.length > minLimit"
+    <button class="favorite-entity-list__expand-button" *ngIf="searchedEntities.length > minLimit && !autoExpand"
       (click)="toggleExpand()" mat-icon-button>
       <mat-icon *ngIf="(limitToggle$ | async) === null">expand_less</mat-icon>
       <mat-icon *ngIf="(limitToggle$ | async) !== null">expand_more</mat-icon>
diff --git a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
index 06800db5f3..ff7bccbc37 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
@@ -13,7 +13,7 @@ import { IFavoriteEntity } from '../../../../../store/src/types/user-favorite-ma
 })
 export class FavoritesEntityListComponent implements OnInit {
 
-  constructor(private favoritesConfigMapper: FavoritesConfigMapper) { }
+  constructor(private favoritesConfigMapper: FavoritesConfigMapper) {}
 
   @Input()
   set entities(favoriteEntities: IFavoriteEntity[]) {
@@ -30,6 +30,9 @@ export class FavoritesEntityListComponent implements OnInit {
   @Input()
   public endpointDisconnected = false;
 
+  @Input()
+  public autoExpand = false;
+
   @Input()
   set endpointTypes(types: string[] | string) {
     if (!this.favoriteTypes) {
@@ -144,5 +147,9 @@ export class FavoritesEntityListComponent implements OnInit {
       map(([nameSearch, type, entities]) => entities.length === 0 && (!!nameSearch || !!type)),
       startWith(false)
     );
+
+    if (this.autoExpand) {
+      this.toggleExpand();
+    }
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.html b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.html
index 4d9fb7f213..394ead2585 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.html
+++ b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.html
@@ -8,12 +8,13 @@
         }"></app-no-content-message>
       </div>
       <div class="favorite-list__group"
-        *ngFor="let favGroup of entityGroups;trackBy: trackByEndpointId; last as isLast">
+        *ngFor="let favGroup of entityGroups;trackBy: trackByEndpointId; last as isLast; count as count">
         <app-favorites-meta-card class="favorite-list__endpoint-card" [endpoint]="true"
           [endpointHasEntities]="favGroup.entities && favGroup.entities.length > 0"
           [favoriteEntity]="favGroup.endpoint"></app-favorites-meta-card>
         <app-favorites-entity-list *ngIf="favGroup.entities && favGroup.entities.length" class="favorite-list__entities"
           [endpointTypes]="favGroup.endpoint.favorite.endpointType" [entities]="favGroup.entities"
+          [autoExpand]="count === 1"
           [showFilters]="showFilters"></app-favorites-entity-list>
         <div *ngIf="favGroup.entities && favGroup.entities.length && !isLast" class="favorite-list__seperator"></div>
       </div>