diff --git a/mediarepo-ui/src/app/components/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/file-search/file-search.component.ts
index 2f30d31..da3f060 100644
--- a/mediarepo-ui/src/app/components/file-search/file-search.component.ts
+++ b/mediarepo-ui/src/app/components/file-search/file-search.component.ts
@@ -148,6 +148,7 @@ export class FileSearchComponent implements AfterViewChecked, OnInit {
     const filterEntries = this.filters.map(f => f.clone());
     const filterDialog = this.dialog.open(FilterDialogComponent, {
       minWidth: "25vw",
+      height: "80vh",
       data: {
         filterEntries,
         availableTags: this.availableTags,
diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html
index 9e8801e..c5762b8 100644
--- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html
+++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html
@@ -1,13 +1,15 @@
 <h1 mat-dialog-title>Filters</h1>
-<div mat-dialog-content>
-  <mat-list>
-    <mat-list-item class="filter-list-item" *ngFor="let expression of filters" [class.selected]="expression.selected">
-      <app-tag-filter-list-item (querySelect)="this.addToSelection($event)" (queryUnselect)="this.removeFromSelection($event)" (removeClicked)="this.removeFilter($event)"
-                                (contextmenu)="contextMenu.onContextMenu($event)" [expression]="expression"></app-tag-filter-list-item>
-    </mat-list-item>
-  </mat-list>
-  <mat-divider></mat-divider>
-  <app-tag-input class="tag-input" [allowNegation]="true" [availableTags]="this.availableTags"
+<div mat-dialog-content fxLayout="column" class="filter-dialog-content">
+  <div fxFlex fxFlexFill class="filter-dialog-list">
+    <mat-list>
+      <mat-list-item class="filter-list-item" *ngFor="let expression of filters" [class.selected]="expression.selected">
+        <app-tag-filter-list-item (querySelect)="this.addToSelection($event)" (queryUnselect)="this.removeFromSelection($event)" (removeClicked)="this.removeFilter($event)"
+                                  (contextmenu)="contextMenu.onContextMenu($event)" [expression]="expression"></app-tag-filter-list-item>
+      </mat-list-item>
+    </mat-list>
+  </div>
+  <mat-divider fxFlex="10px"></mat-divider>
+  <app-tag-input fxFlex="5em" class="tag-input" [allowNegation]="true" [availableTags]="this.availableTags"
                  (tagAdded)="this.addFilter($event)"></app-tag-input>
 </div>
 <div class="dialog-actions" mat-dialog-actions>
diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss
index bea8807..ca664f3 100644
--- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss
+++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss
@@ -26,3 +26,16 @@ app-tag-filter-list-item {
 .selected {
   background-color: #5c5c5c;
 }
+
+.filter-dialog-content {
+  overflow: hidden;
+  height: 100%;
+  width: 100%;
+  margin: 0;
+}
+
+.filter-dialog-list {
+  overflow-y: auto;
+  height: 100%;
+  width: 100%;
+}