src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp

@@ -1588,11 +1588,11 @@
     /*
      * For MouseWheelEvents, hwnd must be changed to be the Component under
      * the mouse, not the Component with the input focus.
      */
 
-    if (msg.message == WM_MOUSEWHEEL) {
+    if (msg.message == WM_MOUSEWHEEL || msg.message == WM_MOUSEHWHEEL) {
             //i.e. mouse is over client area for this window
             DWORD hWndForWheelProcess;
             DWORD hWndForWheelThread = ::GetWindowThreadProcessId(hWndForWheel, &hWndForWheelProcess);
             if (::GetCurrentProcessId() == hWndForWheelProcess) {
                 if (AwtToolkit::MainThread() == hWndForWheelThread) {