diff --git a/frontend/cypress/e2e/tab.cy.ts b/frontend/cypress/e2e/tab.cy.ts
index 4d1cdd714b..bd548ca492 100644
--- a/frontend/cypress/e2e/tab.cy.ts
+++ b/frontend/cypress/e2e/tab.cy.ts
@@ -226,8 +226,7 @@ describe('Tab workflow tests', () => {
       editInputFields('Duplicated by Cypress');
       cy.tabForward();
       cy.tabForward();
-      cy.focused().contains('GJ');
-      cy.realPress('ArrowDown');
+      cy.focused().contains('Aktuell');
       cy.tabForward();
       cy.focused().contains('Speichern');
       cy.realPress('Enter');
diff --git a/frontend/src/app/components/team-filter/team-filter.component.html b/frontend/src/app/components/team-filter/team-filter.component.html
index c02a2a70cd..a69417cf81 100644
--- a/frontend/src/app/components/team-filter/team-filter.component.html
+++ b/frontend/src/app/components/team-filter/team-filter.component.html
@@ -12,14 +12,17 @@
     </mat-chip>
   </button>
   <button
-    matTooltipPosition="above"
-    [matTooltip]="team.name"
     (click)="toggleSelection(team.id)"
     *ngFor="let team of (teams$ | async)?.slice(0, showMoreTeams ? undefined : 6); trackBy: trackByFn"
     [attr.data-testId]="'team-filter-chip'"
+    [matTooltip]="team.name"
+    matTooltipPosition="above"
     class="icon-button focus-outline m-1"
   >
-    <mat-chip [highlighted]="activeTeams.includes(team.id)" color="primary">{{ getTeamName(team.id) }}</mat-chip>
+    <mat-chip [highlighted]="activeTeams.includes(team.id)" color="primary">
+      <p class="d-sm-none d-block">{{ getTeamName(team.id) }}</p>
+      <p class="d-none d-sm-block">{{ team.name }}</p>
+    </mat-chip>
   </button>
   <button
     (click)="showMoreTeams = !showMoreTeams"