diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
index 58c67ce1e..7cbe8c928 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
@@ -231,7 +231,7 @@
             {{ 'file-attributes-csv-import.save' | translate }}
         </button>
 
-        <div class="all-caps-label cancel">{{ 'file-attributes-csv-import.cancel' | translate }}</div>
+        <div class="all-caps-label cancel" (click)="dialogRef.close()">{{ 'file-attributes-csv-import.cancel' | translate }}</div>
     </div>
 
     <redaction-circle-button icon="red:close" mat-dialog-close class="dialog-close"></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
index 2c8403830..34939fa72 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
@@ -1,9 +1,10 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { AppStateService } from '../../../../state/app-state.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import * as Papa from 'papaparse';
 import { FileAttributeConfig, FileAttributesConfig, FileAttributesControllerService } from '@redaction/red-ui-http';
+import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
 
 enum FieldType {
     Text = 'Text',
@@ -35,6 +36,8 @@ export class FileAttributesCsvImportDialogComponent implements OnInit {
     public selectedFields: string[] = [];
     public baseConfigForm: FormGroup;
 
+    @ViewChild(CdkVirtualScrollViewport, { static: false }) cdkVirtualScrollViewport: CdkVirtualScrollViewport;
+
     constructor(
         private readonly _appStateService: AppStateService,
         private readonly _formBuilder: FormBuilder,
@@ -54,13 +57,20 @@ export class FileAttributesCsvImportDialogComponent implements OnInit {
         this._readFile();
     }
 
-    ngOnInit(): void {}
+    ngOnInit(): void {
+        setTimeout(() => {
+            this.cdkVirtualScrollViewport.checkViewportSize();
+        }, 500);
+    }
 
     private _readFile() {
         const reader = new FileReader();
         reader.addEventListener('load', async (event) => {
             const parsedCsv = <any>event.target.result;
-            this.parseResult = Papa.parse(parsedCsv, { header: true, delimiter: this.baseConfigForm.get('delimiter').value });
+            this.parseResult = Papa.parse(parsedCsv, {
+                header: true,
+                delimiter: this.baseConfigForm.get('delimiter').value
+            });
             if (!this.baseConfigForm.get('delimiter').value) {
                 this.baseConfigForm.patchValue({ delimiter: this.parseResult.meta.delimiter });
             }
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.html
index 9ae2ab412..851878fd7 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.html
@@ -1,6 +1,6 @@
-<div [matTooltipClass]="tooltipClass" [matTooltipPosition]="tooltipPosition" [matTooltip]="tooltip | translate">
+<div #matTooltip="matTooltip" [matTooltipClass]="tooltipClass" [matTooltipPosition]="tooltipPosition" [matTooltip]="tooltip | translate">
     <button
-        (click)="performAction($event)"
+        (click)="matTooltip.hide(0); performAction($event)"
         [class.dark-bg]="type === 'dark-bg'"
         [class.primary]="type === 'primary'"
         [class.warn]="type === 'warn'"
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.ts b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.ts
index cd9c3938e..5bfe2c1df 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.ts
@@ -23,7 +23,10 @@ export class CircleButtonComponent implements OnInit {
 
     performAction($event: any) {
         if (!this.disabled) {
-            this.action.emit($event);
+            // Timeout to allow tooltip to disappear first
+            setTimeout(() => {
+                this.action.emit($event);
+            }, 0);
         }
     }
 }