diff --git a/ide/findinfilesdlg.pas b/ide/findinfilesdlg.pas
index d448a01a87..2cba70a664 100644
--- a/ide/findinfilesdlg.pas
+++ b/ide/findinfilesdlg.pas
@@ -7,7 +7,7 @@
   Author: Mattias Gaertner
 
   Abstract:
-    Find in files dialog form.
+    Find in files modal dialog form.
 
 }
 unit FindInFilesDlg;
diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi
index 49b2f887e6..f9a4d46f4b 100644
--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@@ -1461,6 +1461,11 @@
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="IdeStartup_Options"/>
       </Unit>
+      <Unit>
+        <Filename Value="findinfileswnd.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="FindInFilesWnd"/>
+      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/ide/main.pp b/ide/main.pp
index 80a828f895..f47538ce58 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -153,13 +153,14 @@ uses
   InputhistoryWithSearchOpt, UnitDependencies, IDEFPCInfo, IDEInfoDlg,
   IDEInfoNeedBuild, ProcessList, IdeDebuggerOpts, IdeDebuggerWatchResPrinter,
   IdeDebuggerWatchResult, InitialSetupDlgs, InitialSetupProc, NewDialog,
-  MakeResStrDlg, DialogProcs, FindReplaceDialog, FindInFilesDlg, CodeExplorer,
-  BuildFileDlg, ProcedureList, ExtractProcDlg, FindRenameIdentifier,
-  AbstractsMethodsDlg, EmptyMethodsDlg, UnusedUnitsDlg, UseUnitDlg,
-  FindOverloadsDlg, EditorFileManager, CleanDirDlg, CodeContextForm, AboutFrm,
-  CompatibilityRestrictions, RestrictionBrowser, ProjectWizardDlg, IDECmdLine,
-  IDEGuiCmdLine, CodeExplOpts, EditorMacroListViewer, SourceFileManager,
-  EditorToolbarStatic, IDEInstances, NotifyProcessEnd, WordCompletion,
+  MakeResStrDlg, DialogProcs, FindReplaceDialog, FindInFilesDlg, FindInFilesWnd,
+  CodeExplorer, BuildFileDlg, ProcedureList, ExtractProcDlg,
+  FindRenameIdentifier, AbstractsMethodsDlg, EmptyMethodsDlg, UnusedUnitsDlg,
+  UseUnitDlg, FindOverloadsDlg, EditorFileManager, CleanDirDlg, CodeContextForm,
+  AboutFrm, CompatibilityRestrictions, RestrictionBrowser, ProjectWizardDlg,
+  IDECmdLine, IDEGuiCmdLine, CodeExplOpts, EditorMacroListViewer,
+  SourceFileManager, EditorToolbarStatic, IDEInstances, NotifyProcessEnd,
+  WordCompletion,
   // main ide
   MainBar, MainIntf, MainBase;
 
diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index 81472bdff6..cde5165eae 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -72,7 +72,7 @@ uses
   // IDE
   LazConf, LazarusIDEStrConsts, Project, EnvironmentOpts,
   EditorOptions, CompilerOptions, SourceEditor, SourceSynEditor, FindInFilesDlg,
-  Splash, MainBar, MainIntf, Designer, Debugger, RunParamsOpts;
+  Splash, MainBar, MainIntf, Designer, Debugger, RunParamsOpts, FindInFilesWnd;
 
 type
   TResetToolFlag = (
@@ -144,7 +144,6 @@ type
     procedure mnuCenterWindowItemClick(Sender: TObject); virtual;
     procedure mnuWindowSourceItemClick(Sender: TObject); virtual;
     procedure mnuBuildModeClicked(Sender: TObject); virtual; abstract;
-
   public
     function DoResetToolStatus(AFlags: TResetToolFlags): boolean; virtual; abstract;
 
@@ -1037,6 +1036,9 @@ begin
     CreateMenuItem(ParentMI,itmSearchFindNext,'itmSearchFindNext',lisMenuFindNext, 'menu_search_find_next');
     CreateMenuItem(ParentMI,itmSearchFindPrevious,'itmSearchFindPrevious',lisMenuFindPrevious, 'menu_search_find_previous');
     CreateMenuItem(ParentMI,itmSearchFindInFiles,'itmSearchFindInFiles',lisMenuFindInFiles, 'menu_search_files');
+    {$IFDEF EnableFindInFilesWnd}
+    RegisterFindInFilesWnd;
+    {$ENDIF}
     CreateMenuItem(ParentMI,itmSearchReplace, 'itmSearchReplace', lisBtnDlgReplace, 'menu_search_replace');
     CreateMenuItem(ParentMI,itmIncrementalFind,'itmIncrementalFind',lisMenuIncrementalFind, 'menu_search_incremental');