diff --git a/mediarepo-ui/src/app/components/file-search/file-search.component.scss b/mediarepo-ui/src/app/components/file-search/file-search.component.scss
index 81993c7..1dfe215 100644
--- a/mediarepo-ui/src/app/components/file-search/file-search.component.scss
+++ b/mediarepo-ui/src/app/components/file-search/file-search.component.scss
@@ -57,6 +57,6 @@
 
 .filter-dialog-button {
   position: absolute;
-  right: 0;
+  right: -13px;
   top: -20px;
 }
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 00a98ef..83d9da1 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
@@ -6,7 +6,7 @@
           <app-file-search #filesearch (searchEndEvent)="this.searchEndEvent.emit()"
                            (searchStartEvent)="this.searchStartEvent.emit()"
                            [validTags]="this.getValidTagsForSearch()"
-                           [availableTags]="this.tagsOfFiles"></app-file-search>
+                           [availableTags]="this.allTags"></app-file-search>
         </div>
         <mat-divider fxFlex="1em"></mat-divider>
         <div class="tag-list-header" fxFlex="40px">
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 062c8c2..6767c0c 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
@@ -32,6 +32,7 @@ export class FilesTabSidebarComponent implements OnInit, OnChanges {
 
   public tagsOfFiles: Tag[] = [];
   public tags: Tag[] = [];
+  public allTags: Tag[] = [];
   public files: File[] = [];
   public tagsOfSelection: Tag[] = [];
 
@@ -43,6 +44,7 @@ export class FilesTabSidebarComponent implements OnInit, OnChanges {
     });
     this.repoService.selectedRepository.subscribe(
       async (repo) => repo && this.fileSearch && await this.fileSearch.searchForFiles());
+    this.tagService.tags.subscribe(t => this.allTags = t);
   }
 
   async ngOnInit() {