Index: oup/current/Tools/Template.dfm
===================================================================
--- oup/current/Tools/Template.dfm	(revision 54)
+++ oup/current/Tools/Template.dfm	(revision 58)
@@ -17,4 +17,5 @@
   Visible = True
   WindowState = wsMaximized
+  OnActivate = FormActivate
   OnClose = FormClose
   OnCreate = FormCreate
Index: oup/current/Tools/Template.pas
===================================================================
--- oup/current/Tools/Template.pas	(revision 54)
+++ oup/current/Tools/Template.pas	(revision 58)
@@ -55,4 +55,5 @@
     procedure filepopupPopup(Sender: TObject);
     procedure btn_sortClick(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
   private
     FSortBy: TSortType;
@@ -365,4 +366,9 @@
 end;
 
+procedure TForm_ToolTemplate.FormActivate(Sender: TObject);
+begin
+  edit_filtername.SetFocus;
+end;
+
 procedure TForm_ToolTemplate.FormClose(Sender: TObject; var Action: TCloseAction);
 begin