diff --git a/source/sqlhelp.dfm b/source/sqlhelp.dfm
index d8a8235a..a463c2b4 100644
--- a/source/sqlhelp.dfm
+++ b/source/sqlhelp.dfm
@@ -15,6 +15,7 @@ object frmSQLhelp: TfrmSQLhelp
   OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
   object btnSearchOnline: TButton
diff --git a/source/sqlhelp.pas b/source/sqlhelp.pas
index f912873c..051c318e 100644
--- a/source/sqlhelp.pas
+++ b/source/sqlhelp.pas
@@ -50,6 +50,7 @@ type
     procedure editFilterChange(Sender: TObject);
     procedure editFilterRightButtonClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
 
   private
     { Private declarations }
@@ -268,6 +269,12 @@ begin
 end;
 
 
+procedure TfrmSQLhelp.FormShow(Sender: TObject);
+begin
+  editFilter.SetFocus;
+end;
+
+
 procedure TfrmSQLhelp.ButtonOnlinehelpClick(Sender: TObject);
 begin
   // Link/redirect to mysql.com for further help