diff --git a/lcl/include/listitem.inc b/lcl/include/listitem.inc
index 0c7e058eeb..969a08f8b9 100644
--- a/lcl/include/listitem.inc
+++ b/lcl/include/listitem.inc
@@ -757,6 +757,8 @@ begin
 
   if not WSUpdateAllowed and not IsOwnerData then Exit;
   LV := FOwner.FOwner;
+  if (LV.OwnerData) and (LV.MultiSelect) and (AState = lisSelected) then
+    LV.UpdateMultiSelList(Self, AIsSet);
   TWSCustomListViewClass(LV.WidgetSetClass).ItemSetState(LV, GetIndex, Self, AState, AIsSet);
 end;
 
diff --git a/test/runtestsgui.lpi b/test/runtestsgui.lpi
index fb1dfd0619..954be900bd 100644
--- a/test/runtestsgui.lpi
+++ b/test/runtestsgui.lpi
@@ -143,4 +143,11 @@
       </Debugging>
     </Linking>
   </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="1">
+      <Item1>
+        <Name Value="EAssertionFailedError"/>
+      </Item1>
+    </Exceptions>
+  </Debugging>
 </CONFIG>