diff --git a/source/main.dfm b/source/main.dfm
index 46310175..971fce3c 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -294,6 +294,7 @@ object MainForm: TMainForm
           TextHint = 'Database filter'
           OnChange = editDatabaseTableFilterChange
           OnExit = editDatabaseTableFilterExit
+          OnKeyPress = editDatabaseTableFilterKeyPress
           OnLeftButtonClick = editDatabaseTableFilterLeftButtonClick
           OnRightButtonClick = editDatabaseTableFilterRightButtonClick
         end
@@ -311,6 +312,7 @@ object MainForm: TMainForm
           TextHint = 'Table filter'
           OnChange = editDatabaseTableFilterChange
           OnExit = editDatabaseTableFilterExit
+          OnKeyPress = editDatabaseTableFilterKeyPress
           OnLeftButtonClick = editDatabaseTableFilterLeftButtonClick
           OnRightButtonClick = editDatabaseTableFilterRightButtonClick
         end
diff --git a/source/main.pas b/source/main.pas
index c810393c..7d713a8e 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -981,6 +981,7 @@ type
     procedure editDatabaseTableFilterRightButtonClick(Sender: TObject);
     procedure menuDoubleClickInsertsNodeTextClick(Sender: TObject);
     procedure DBtreeDblClick(Sender: TObject);
+    procedure editDatabaseTableFilterKeyPress(Sender: TObject; var Key: Char);
   private
     // Executable file details
     FAppVerMajor: Integer;
@@ -7241,6 +7242,13 @@ begin
 end;
 
 
+procedure TMainForm.editDatabaseTableFilterKeyPress(Sender: TObject; var Key: Char);
+begin
+  if Key = #27 then
+    (Sender as TButtonedEdit).OnRightButtonClick(Sender);
+end;
+
+
 procedure TMainForm.TimerFilterVTTimer(Sender: TObject);
 begin
   // Disable timer to avoid filtering in a loop