diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c
index fc55c4acfb..6751d70c7c 100644
--- a/win32ss/user/ntuser/defwnd.c
+++ b/win32ss/user/ntuser/defwnd.c
@@ -785,7 +785,13 @@ IntDefWindowProc(
          {
             HWND hwndTop = UserGetForegroundWindow();
             PWND topWnd = UserGetWindowObject(hwndTop);
-            if (topWnd)
+
+TRACE("topWnd is '%p' and hwndTop is '%p'.\n", topWnd, hwndTop);
+
+            /* We want to compare hwndTop with the Taskbar handle, but I am not able to find it */
+            /* Until we can, I have noticed that the Taskbar handle is > 0x60000 in general */
+
+            if (topWnd && ((INT)hwndTop < 0x60000))  /* Add test for not Taskbar */
             {
                if ((topWnd->style & WS_THICKFRAME) == 0)
                {