diff --git a/erdblick_app/app/feature.search.component.ts b/erdblick_app/app/feature.search.component.ts
index b6efe712..7cd9205c 100644
--- a/erdblick_app/app/feature.search.component.ts
+++ b/erdblick_app/app/feature.search.component.ts
@@ -14,7 +14,7 @@ import {KeyboardService} from "./keyboard.service";
         <div [ngClass]="{'z-index-low': sidePanelService.featureSearchOpen && sidePanelService.searchOpen}">
             <p-dialog class="side-menu-dialog" header="Search Loaded Features"
                       [(visible)]="isPanelVisible" style="padding: 0 0.5em 0.5em 0.5em"
-                      [position]="'topleft'" [draggable]="false" [resizable]="false" [closeOnEscape]="false"
+                      [position]="'topleft'" [draggable]="false" [resizable]="false"
                       (onShow)="onShow($event)" (onHide)="onHide($event)">
                 <div class="feature-search-controls">
                     <div class="progress-bar-container">
diff --git a/erdblick_app/app/keyboard.service.ts b/erdblick_app/app/keyboard.service.ts
index a86739ff..fff06087 100644
--- a/erdblick_app/app/keyboard.service.ts
+++ b/erdblick_app/app/keyboard.service.ts
@@ -42,13 +42,14 @@ export class KeyboardService {
             if (!isInput) {
                 const key = this.getKeyCombination(event);
                 if (key === 'Escape' || key === 'Esc') {
-                    if (this.dialogStack.length > 0) {
-                        event.preventDefault();
-                        const topDialog = this.dialogStack.pop();
-                        if (topDialog) {
-                            topDialog.close(new MouseEvent("mousedown"));
-                        }
-                    }
+                    // TODO: make this work!
+                    // if (this.dialogStack.length > 0) {
+                    //     event.preventDefault();
+                    //     const topDialog = this.dialogStack.pop();
+                    //     if (topDialog) {
+                    //         topDialog.close(new MouseEvent("mousedown"));
+                    //     }
+                    // }
                 } else if (this.shortcuts.has(key)) {
                     event.preventDefault();
                     this.shortcuts.get(key)?.(event);
diff --git a/erdblick_app/app/map.panel.component.ts b/erdblick_app/app/map.panel.component.ts
index 187d4723..bb3b2ceb 100644
--- a/erdblick_app/app/map.panel.component.ts
+++ b/erdblick_app/app/map.panel.component.ts
@@ -19,7 +19,7 @@ import {KeyboardService} from "./keyboard.service";
     template: `
         <p-dialog #mapLayerDialog class="map-layer-dialog" header="" [(visible)]="layerDialogVisible"
                   [position]="'topleft'" [draggable]="false" [resizable]="false" (onShow)="keyboardService.dialogOnShow($event)" 
-                  (onHide)="keyboardService.dialogOnHide($event)" [closeOnEscape]="false">
+                  (onHide)="keyboardService.dialogOnHide($event)">
             <p-fieldset class="map-tab" legend="Maps and Layers">
                 <div class="osm-controls">
                     <span style="font-size: 0.9em">OSM Overlay:</span>