--- old/src/java.desktop/windows/native/libawt/windows/awt_List.cpp	2018-11-05 21:01:22.970453042 +0530
+++ new/src/java.desktop/windows/native/libawt/windows/awt_List.cpp	2018-11-05 21:01:22.494215042 +0530
@@ -478,16 +478,23 @@
 MsgRouting AwtList::HandleEvent(MSG *msg, BOOL synthetic)
 {
     if (IsFocusingMouseMessage(msg)) {
-        LONG item = static_cast<LONG>(SendListMessage(LB_ITEMFROMPOINT, 0, msg->lParam));
-        if (item != LB_ERR) {
-            if (isMultiSelect) {
-                if (IsItemSelected(item)) {
-                    Deselect(item);
+        LONG count = GetCount();
+        if (count > 0) {
+            LONG item = static_cast<LONG>(SendListMessage(LB_ITEMFROMPOINT, 0, msg->lParam));
+            item = LOWORD(item);
+            if (SendListMessage(LB_GETTOPINDEX, 0, 0) > item) {
+                item = (count / max_index) * max_index + item + 1;
+            }
+            if (item < count) {
+                if (isMultiSelect) {
+                    if (IsItemSelected(item)) {
+                        Deselect(item);
+                    } else {
+                        Select(item);
+                    }
                 } else {
                     Select(item);
                 }
-            } else {
-                Select(item);
             }
         }
         delete msg;