diff --git a/erdblick_app/app/search.panel.component.ts b/erdblick_app/app/search.panel.component.ts
index d073d110..1a174672 100644
--- a/erdblick_app/app/search.panel.component.ts
+++ b/erdblick_app/app/search.panel.component.ts
@@ -514,8 +514,12 @@ export class SearchPanelComponent implements AfterViewInit {
             }
         } else if (event.key === 'Escape') {
             event.stopPropagation();
-            this.setSearchValue("");
-        }
+            if (this.searchInputValue) {
+                this.setSearchValue("");
+                return;
+            }
+            this.dialog.close(event);
+        }``
     }
 
     selectHistoryEntry(index: number) {