diff --git a/applications/lazedit/lazedit_constants.pp b/applications/lazedit/lazedit_constants.pp
index 6c9c4a32e..6e5f479e4 100644
--- a/applications/lazedit/lazedit_constants.pp
+++ b/applications/lazedit/lazedit_constants.pp
@@ -91,6 +91,7 @@ const
   //FilterIndexes all start with FilterAllSupported, then all individually supported filetypes followed by .txt, templates and *
   //Filter indexes
   fiAllSupported = 1; //FilterIndexes are 1-based!
+  fiTemplates = 1; //for use with Open/SaveAsTemplate dialog only!
 
   fiEftFirst = Ord(Low(TEditorFileType)) + 2; //skip eftNone, add 1 for fiAllSupported
   fiEftLast = Ord(High(TEditorFileType)) + 1; //Add 1 for fiAllSupported
diff --git a/applications/lazedit/main.pp b/applications/lazedit/main.pp
index 434508256..15bbf7ce4 100644
--- a/applications/lazedit/main.pp
+++ b/applications/lazedit/main.pp
@@ -1937,7 +1937,7 @@ end;
 function TLazEditMainForm.AskFileNameOpen: String;
 begin
   OpenDialog.Filter := OpenSaveFilter;
-  OpenDialog.FilterIndex := 0;
+  OpenDialog.FilterIndex := fiAllSupported;
   if OpenDialog.Execute then
   begin
     Result := OpenDialog.FileName;
@@ -1949,7 +1949,7 @@ end;
 function TLazEditMainForm.AskFileNameOpenTemplate: String;
 begin
   OpenDialog.Filter := TemplateFilter;
-  OpenDialog.FilterIndex := 0;
+  OpenDialog.FilterIndex := fiTemplates;
   if OpenDialog.Execute then
   begin
     Result := OpenDialog.FileName;
@@ -1991,7 +1991,7 @@ end;
 function TLazEditMainForm.AskFileNameSaveTemplate: String;
 begin
   SaveDialog.Filter := TemplateFilter;
-  SaveDialog.FilterIndex := 0;
+  SaveDialog.FilterIndex := fiTemplates;
   if SaveDialog.Execute then
   begin
     Result := SaveDialog.FileName;