diff --git a/.gitattributes b/.gitattributes
index 53a5cfb314..5433c39554 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2046,7 +2046,6 @@ components/lazcontrols/images/ttreefilteredit.png -text svneol=unset#image/png
 components/lazcontrols/lazcontrols.lpk svneol=native#text/xml
 components/lazcontrols/lazcontrols.pas svneol=native#text/pascal
 components/lazcontrols/lazcontrols.res -text
-components/lazcontrols/lazctrls.bat svneol=native#text/plain
 components/lazcontrols/listfilteredit.pas svneol=native#text/plain
 components/lazcontrols/listviewfilteredit.pas svneol=native#text/pascal
 components/lazcontrols/lvlgraphctrl.pas svneol=native#text/plain
diff --git a/components/lazcontrols/fpmake.pp b/components/lazcontrols/fpmake.pp
index 817847f915..9225767814 100644
--- a/components/lazcontrols/fpmake.pp
+++ b/components/lazcontrols/fpmake.pp
@@ -47,15 +47,19 @@ begin
     P.Options.Add('-Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET)');
     P.Options.Add('-Fu.');
     T:=P.Targets.AddUnit('lazcontrols.pas');
+    t.Dependencies.AddUnit('checkboxthemed');
     t.Dependencies.AddUnit('dividerbevel');
     t.Dependencies.AddUnit('extendednotebook');
     t.Dependencies.AddUnit('listfilteredit');
+    t.Dependencies.AddUnit('listviewfilteredit');
     t.Dependencies.AddUnit('treefilteredit');
     t.Dependencies.AddUnit('shortpathedit');
 
+    T:=P.Targets.AddUnit('checkboxthemed.pas');
     T:=P.Targets.AddUnit('dividerbevel.pas');
     T:=P.Targets.AddUnit('extendednotebook.pas');
     T:=P.Targets.AddUnit('listfilteredit.pas');
+    T:=P.Targets.AddUnit('listviewfilteredit.pas');
     T:=P.Targets.AddUnit('treefilteredit.pas');
     T:=P.Targets.AddUnit('shortpathedit.pas');
 
diff --git a/components/lazcontrols/lazcontrols.lpk b/components/lazcontrols/lazcontrols.lpk
index 918ba93742..7a1044d947 100644
--- a/components/lazcontrols/lazcontrols.lpk
+++ b/components/lazcontrols/lazcontrols.lpk
@@ -18,46 +18,51 @@
     <Description Value="Some extra LCL controls needed by the IDE."/>
     <License Value="modified LGPL-2"/>
     <Version Major="1" Release="1"/>
-    <Files Count="8">
+    <Files Count="9">
       <Item1>
-        <Filename Value="dividerbevel.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="DividerBevel"/>
-      </Item1>
-      <Item2>
-        <Filename Value="extendednotebook.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="ExtendedNotebook"/>
-      </Item2>
-      <Item3>
-        <Filename Value="listfilteredit.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="ListFilterEdit"/>
-      </Item3>
-      <Item4>
-        <Filename Value="treefilteredit.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="TreeFilterEdit"/>
-      </Item4>
-      <Item5>
-        <Filename Value="shortpathedit.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="ShortPathEdit"/>
-      </Item5>
-      <Item6>
-        <Filename Value="lvlgraphctrl.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="LvlGraphCtrl"/>
-      </Item6>
-      <Item7>
-        <Filename Value="extendedtabcontrols.pas"/>
-        <UnitName Value="ExtendedTabControls"/>
-      </Item7>
-      <Item8>
         <Filename Value="checkboxthemed.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="CheckBoxThemed"/>
+      </Item1>
+      <Item2>
+        <Filename Value="dividerbevel.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="DividerBevel"/>
+      </Item2>
+      <Item3>
+        <Filename Value="extendednotebook.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="ExtendedNotebook"/>
+      </Item3>
+      <Item4>
+        <Filename Value="listfilteredit.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="ListFilterEdit"/>
+      </Item4>
+      <Item5>
+        <Filename Value="listviewfilteredit.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="ListViewFilterEdit"/>
+      </Item5>
+      <Item6>
+        <Filename Value="treefilteredit.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="TreeFilterEdit"/>
+      </Item6>
+      <Item7>
+        <Filename Value="shortpathedit.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="ShortPathEdit"/>
+      </Item7>
+      <Item8>
+        <Filename Value="lvlgraphctrl.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="LvlGraphCtrl"/>
       </Item8>
+      <Item9>
+        <Filename Value="extendedtabcontrols.pas"/>
+        <UnitName Value="ExtendedTabControls"/>
+      </Item9>
     </Files>
     <LazDoc Paths="docs"/>
     <Type Value="RunAndDesignTime"/>
diff --git a/components/lazcontrols/lazcontrols.pas b/components/lazcontrols/lazcontrols.pas
index 4aacec8418..833bd1ae3f 100644
--- a/components/lazcontrols/lazcontrols.pas
+++ b/components/lazcontrols/lazcontrols.pas
@@ -7,9 +7,9 @@ unit LazControls;
 interface
 
 uses
-  DividerBevel, ExtendedNotebook, ListFilterEdit, TreeFilterEdit, 
-  ShortPathEdit, LvlGraphCtrl, ExtendedTabControls, CheckBoxThemed, 
-  LazarusPackageIntf;
+  CheckBoxThemed, DividerBevel, ExtendedNotebook, ListFilterEdit, 
+  ListViewFilterEdit, TreeFilterEdit, ShortPathEdit, LvlGraphCtrl, 
+  ExtendedTabControls, LazarusPackageIntf;
 
 implementation
 
@@ -17,13 +17,14 @@ implementation
 
 procedure Register;
 begin
+  RegisterUnit('CheckBoxThemed', @CheckBoxThemed.Register);
   RegisterUnit('DividerBevel', @DividerBevel.Register);
   RegisterUnit('ExtendedNotebook', @ExtendedNotebook.Register);
   RegisterUnit('ListFilterEdit', @ListFilterEdit.Register);
+  RegisterUnit('ListViewFilterEdit', @ListViewFilterEdit.Register);
   RegisterUnit('TreeFilterEdit', @TreeFilterEdit.Register);
   RegisterUnit('ShortPathEdit', @ShortPathEdit.Register);
   RegisterUnit('LvlGraphCtrl', @LvlGraphCtrl.Register);
-  RegisterUnit('CheckBoxThemed', @CheckBoxThemed.Register);
 end;
 
 initialization
diff --git a/components/lazcontrols/lazcontrols.res b/components/lazcontrols/lazcontrols.res
index 69fb32ac5e..390ca091d8 100644
Binary files a/components/lazcontrols/lazcontrols.res and b/components/lazcontrols/lazcontrols.res differ
diff --git a/components/lazcontrols/lazctrls.bat b/components/lazcontrols/lazctrls.bat
deleted file mode 100755
index 1a724a8a52..0000000000
--- a/components/lazcontrols/lazctrls.bat
+++ /dev/null
@@ -1 +0,0 @@
-..\..\tools\lazres lazcontrols.res images\dividerbevel.png=tdividerbevel images\textnotebook.png=textendednotebook images\listfilteredit.png=tlistfilteredit images\treefilteredit.png=ttreefilteredit  images\tlvlgraphcontrol.png  images\shortpathedit.png=tshortpathedit  images\checkboxthemed.png=tcheckboxthemed
diff --git a/components/lazcontrols/listfilteredit.pas b/components/lazcontrols/listfilteredit.pas
index 61f902b03b..0e450e6da5 100644
--- a/components/lazcontrols/listfilteredit.pas
+++ b/components/lazcontrols/listfilteredit.pas
@@ -158,7 +158,7 @@ begin
     if not (Pass or Done) then
       Pass:=(Filter='') or (Pos(Filter,UTF8LowerCase(s))>0);
     if Pass then begin
-      i:=fSortedData.Count-1;
+      i:=fSortedData.Count-1;       // Always sort the data.
       while i>=0 do begin
         if CompareFNs(s,fSortedData[i])>=0 then break;
         dec(i);