diff --git a/ide/findinfilesdlg.lfm b/ide/findinfilesdlg.lfm
index b3631d1726..2616811fe0 100644
--- a/ide/findinfilesdlg.lfm
+++ b/ide/findinfilesdlg.lfm
@@ -296,7 +296,7 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
   end
   object SelectDirectoryDialog: TSelectDirectoryDialog
     FilterIndex = 0
-    Options = [ofFileMustExist, ofEnableSizing, ofViewDetail]
+    Options = [ofExtensionDifferent,ofFileMustExist,ofEnableSizing,ofViewDetail]
     Left = 180
     Top = 70
   end
diff --git a/ide/findinfilesdlg.pas b/ide/findinfilesdlg.pas
index 77570502be..1da332a1d8 100644
--- a/ide/findinfilesdlg.pas
+++ b/ide/findinfilesdlg.pas
@@ -160,6 +160,7 @@ begin
   else
     SelectDirectoryDialog.InitialDir := GetBaseDirectory;
 
+  SelectDirectoryDialog.FileName:='';
   if SelectDirectoryDialog.Execute then
     DirectoriesComboBox.Text := AppendPathDelim(TrimFilename(SelectDirectoryDialog.FileName));
   StoreIDEFileDialog(SelectDirectoryDialog);