diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts
index 02a5d40c95..2728ef4616 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts
+++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts
@@ -94,6 +94,10 @@ describe('AspectListDialogComponent', () => {
     let aspectListService: AspectListService;
     let nodeService: NodesApiService;
     let data: AspectListDialogComponentData;
+    const event = new KeyboardEvent('keydown', {
+        bubbles: true,
+        keyCode: 27
+    } as KeyboardEventInit );
 
     describe('Without passing node id', () => {
 
@@ -116,7 +120,7 @@ describe('AspectListDialogComponent', () => {
                     {
                         provide: MatDialogRef,
                         useValue: {
-                            keydownEvents: () => of(null),
+                            keydownEvents: () => of(event),
                             backdropClick: () => of(null),
                             close: jasmine.createSpy('close')
                         }
@@ -255,7 +259,7 @@ describe('AspectListDialogComponent', () => {
                         provide: MatDialogRef,
                         useValue: {
                             close: jasmine.createSpy('close'),
-                            keydownEvents: () => of(null),
+                            keydownEvents: () => of(event),
                             backdropClick: () => of(null)
                         }
                     }
diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts
index fb2bac4c35..b2062d3656 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts
+++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts
@@ -45,6 +45,14 @@ export class AspectListDialogComponent implements OnInit {
         this.dialog.backdropClick().subscribe(() => {
             this.close();
         });
+        this.dialog.keydownEvents().subscribe(event => {
+            // Esc
+            if (event.keyCode === 27) {
+                event.preventDefault();
+                event.stopImmediatePropagation();
+                this.close();
+            }
+        });
     }
 
     onValueChanged(aspectList: string[]) {