diff --git a/mediarepo-ui/src/app/app.module.ts b/mediarepo-ui/src/app/app.module.ts
index 8f0e901..aab9560 100644
--- a/mediarepo-ui/src/app/app.module.ts
+++ b/mediarepo-ui/src/app/app.module.ts
@@ -48,6 +48,7 @@ import {MatMenuModule} from "@angular/material/menu";
 import { ConfirmDialogComponent } from './components/confirm-dialog/confirm-dialog.component';
 import { FilesTabSidebarComponent } from './pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component';
 import {MatExpansionModule} from "@angular/material/expansion";
+import { TagItemComponent } from './components/tag-item/tag-item.component';
 
 @NgModule({
   declarations: [
@@ -66,6 +67,7 @@ import {MatExpansionModule} from "@angular/material/expansion";
     AddRepositoryDialogComponent,
     ConfirmDialogComponent,
     FilesTabSidebarComponent,
+    TagItemComponent,
   ],
   imports: [
     BrowserModule,
diff --git a/mediarepo-ui/src/app/components/tag-item/tag-item.component.html b/mediarepo-ui/src/app/components/tag-item/tag-item.component.html
new file mode 100644
index 0000000..2a540bc
--- /dev/null
+++ b/mediarepo-ui/src/app/components/tag-item/tag-item.component.html
@@ -0,0 +1,4 @@
+<div class="tag-item-wrapper">
+  <span *ngIf="tag.namespace" class="tag-item-namespace" [style]="{color: namespaceColor}">{{tag.namespace}}:</span>
+  <span class="tag-item-name" [style]="{color: tagColor}">{{tag.name}}</span>
+</div>
diff --git a/mediarepo-ui/src/app/components/tag-item/tag-item.component.scss b/mediarepo-ui/src/app/components/tag-item/tag-item.component.scss
new file mode 100644
index 0000000..5e91837
--- /dev/null
+++ b/mediarepo-ui/src/app/components/tag-item/tag-item.component.scss
@@ -0,0 +1,10 @@
+.tag-item-wrapper {
+  display: inline;
+  width: 100%;
+  padding: 0.25em;
+}
+
+.tag-item-namespace {
+  margin-right: 0.25em;
+  opacity: 80%;
+}
diff --git a/mediarepo-ui/src/app/components/tag-item/tag-item.component.spec.ts b/mediarepo-ui/src/app/components/tag-item/tag-item.component.spec.ts
new file mode 100644
index 0000000..58b5f2b
--- /dev/null
+++ b/mediarepo-ui/src/app/components/tag-item/tag-item.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TagItemComponent } from './tag-item.component';
+
+describe('TagItemComponent', () => {
+  let component: TagItemComponent;
+  let fixture: ComponentFixture<TagItemComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ TagItemComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TagItemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/mediarepo-ui/src/app/components/tag-item/tag-item.component.ts b/mediarepo-ui/src/app/components/tag-item/tag-item.component.ts
new file mode 100644
index 0000000..0cc2219
--- /dev/null
+++ b/mediarepo-ui/src/app/components/tag-item/tag-item.component.ts
@@ -0,0 +1,16 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {Tag} from "../../models/Tag";
+
+@Component({
+  selector: 'app-tag-item',
+  templateUrl: './tag-item.component.html',
+  styleUrls: ['./tag-item.component.scss']
+})
+export class TagItemComponent {
+
+  @Input() tag!: Tag;
+  @Input() namespaceColor: string | undefined;
+  @Input() tagColor: string | undefined;
+
+  constructor() { }
+}
diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.html b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.html
index 50322bd..5a4ecdd 100644
--- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.html
+++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.html
@@ -1,19 +1,22 @@
 <div class="sidebar-inner">
   <mat-tab-group headerPosition="below">
     <mat-tab label="Search">
-      <div class="search-tab-inner"  fxLayout="column">
+      <div class="search-tab-inner" fxLayout="column">
         <div id="file-search-input" >
           <app-file-search #filesearch (searchStartEvent)="this.searchStartEvent.emit()"
                            (searchEndEvent)="this.searchEndEvent.emit()" [validTags]="this.getValidTagsForSearch()"></app-file-search>
         </div>
-        <div id="file-tag-list" fxFlex fxFlexAlign="start" fxFlexFill>
-          <h1>Selection Tags</h1>
-          <mat-selection-list [multiple]="false" *ngIf="tags.length > 0"
-                              (selectionChange)="addSearchTagFromList($event)">
-            <mat-list-option
-              *ngFor="let tag of tags"
-              [value]="tag.getNormalizedOutput()">{{tag.getNormalizedOutput()}}</mat-list-option>
-          </mat-selection-list>
+        <mat-divider fxFlex="1em"></mat-divider>
+        <div  class="tag-list-header" fxFlex="40px">
+          <h2>Tags</h2>
+          <mat-divider></mat-divider>
+        </div>
+        <div class="file-tag-list" fxFlex fxFlexAlign="start" fxFlexFill>
+          <cdk-virtual-scroll-viewport itemSize="50" maxBufferPx="4000" minBufferPx="500">
+            <div class="selectable-tag" *cdkVirtualFor="let tag of tags" matRipple (click)="addSearchTag(tag)">
+              <app-tag-item [tag]="tag"></app-tag-item>
+            </div>
+          </cdk-virtual-scroll-viewport>
         </div>
       </div>
     </mat-tab>
diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.scss b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.scss
index 8eea9f2..30b9a87 100644
--- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.scss
+++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.scss
@@ -8,13 +8,7 @@ app-file-search {
   overflow: hidden;
 }
 
-#file-tag-list {
-  height: 100%;
-  overflow-y: auto;
-  width: 100%;
-}
-
-mat-tab-group, mat-tab {
+mat-tab-group, mat-tab, .file-tag-list {
   height: 100%;
   width: 100%;
 }
@@ -29,3 +23,51 @@ mat-selection-list {
   width: 100%;
   display: block;
 }
+
+.selectable-tag {
+  height: 50px;
+  display: flex;
+  font-size: 1.2em;
+  cursor: pointer;
+  transition-duration: 0.1s;
+  user-select: none;
+
+  app-tag-item {
+    margin: auto auto auto 0.25em;
+  }
+}
+
+.selectable-tag:hover {
+  background-color: darken(dimgrey, 10);
+}
+
+.selectable-tag:active {
+  cursor: pointer;
+}
+
+.file-tag-list-inner {
+  display: block;
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+}
+
+cdk-virtual-scroll-viewport {
+  height: 100%;
+  width: 100%;
+  overflow-y: auto;
+}
+
+mat-divider {
+  width: 100%;
+}
+
+.tag-list-header {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+
+  h2 {
+    margin: auto;
+  }
+}
diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts
index 2c53808..dbb6991 100644
--- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts
+++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts
@@ -36,31 +36,33 @@ export class FilesTabSidebarComponent implements OnInit, OnChanges {
       this.files = files;
       await this.loadTagsForDisplayedFiles();
     });
-    this.repoService.selectedRepository.subscribe(async (repo) => repo && this.fileSearch && await this.fileSearch.searchForFiles());
+    this.repoService.selectedRepository.subscribe(
+      async (repo) => repo && this.fileSearch && await this.fileSearch.searchForFiles());
   }
 
   async ngOnInit() {
     this.fileSearch && await this.fileSearch.searchForFiles();
+    if (this.tags.length === 0) {
+      this.tags = this.tagsOfFiles;
+    }
   }
 
-  public async ngOnChanges(changes: SimpleChanges): Promise<void >{
+  public async ngOnChanges(changes: SimpleChanges): Promise<void> {
     if (changes["selectedFiles"]) {
-      const tags = await this.tagService.getTagsForFiles(this.selectedFiles.map(f => f.hash));
-      this.tags = tags.sort((a, b) => a.getNormalizedOutput().localeCompare(b.getNormalizedOutput()));
+      await this.showFileDetails(this.selectedFiles);
+      this.showAllTagsFallback();
     }
   }
 
   async loadTagsForDisplayedFiles() {
-    this.tagsOfFiles = await this.tagService.getTagsForFiles(this.files.map(f => f.hash));
+    this.tagsOfFiles = await this.tagService.getTagsForFiles(
+      this.files.map(f => f.hash));
+    this.showAllTagsFallback();
   }
 
-  async addSearchTagFromList(event: MatSelectionListChange) {
-    if (event.options.length > 0) {
-      const tag = event.options[0].value;
-      this.fileSearch.addSearchTag(tag);
-      await this.fileSearch.searchForFiles();
-    }
-    event.source.deselectAll();
+  async addSearchTag(tag: Tag) {
+    this.fileSearch.addSearchTag(tag.getNormalizedOutput());
+    await this.fileSearch.searchForFiles();
   }
 
   getValidTagsForSearch(): string[] {
@@ -69,6 +71,14 @@ export class FilesTabSidebarComponent implements OnInit, OnChanges {
 
   async showFileDetails(files: File[]) {
     this.tags = await this.tagService.getTagsForFiles(files.map(f => f.hash))
-    this.tags = this.tags.sort((a, b) => a.getNormalizedOutput().localeCompare(b.getNormalizedOutput()));
+    this.tags = this.tags.sort(
+      (a, b) => a.getNormalizedOutput().localeCompare(b.getNormalizedOutput()));
+  }
+
+  showAllTagsFallback() {
+    if (this.tags.length === 0) {
+      this.tags = this.tagsOfFiles.sort(
+        (a, b) => a.getNormalizedOutput().localeCompare(b.getNormalizedOutput()));;
+    }
   }
 }