diff --git a/components/lazcontrols/listfilteredit.pas b/components/lazcontrols/listfilteredit.pas
index 188b73a1fb..e2b9f8dd2b 100644
--- a/components/lazcontrols/listfilteredit.pas
+++ b/components/lazcontrols/listfilteredit.pas
@@ -187,9 +187,10 @@ var
   i: Integer;
 begin
   fSelectionList.Clear;
-  for i := 0 to fFilteredListbox.Count-1 do
-    if fFilteredListbox.Selected[i] then
-      fSelectionList.Add(fFilteredListbox.Items[i]);
+  if fFilteredListbox.SelCount > 0 then
+    for i := 0 to fFilteredListbox.Count-1 do
+      if fFilteredListbox.Selected[i] then
+        fSelectionList.Add(fFilteredListbox.Items[i]);
 end;
 
 procedure TListFilterEdit.RestoreSelection;