diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 81fe66ca8a..da822d8512 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2682,6 +2682,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         // Multi-selections should not be cleared if a selected item is clicked.
         if (!IsHighlighted(current))
         {
+            HighlightAll(false);
             ChangeCurrent(current);
             HighlightOnly(m_current);
         }