diff --git a/windows/win.c b/windows/win.c
index edd440cf56359a95c21961c9050db22292ac5416..7732c6c2b31f13d7cc5e75177f9c29bb47ef0792 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -1525,7 +1525,9 @@ static HWND WIN_FindWindow( HWND parent, HWND child, ATOM className,
     {
         if (className && !(pWnd->dwStyle & WS_CHILD))
         {
-            if (!(pClass = CLASS_FindClassByAtom( className, pWnd->hInstance)))
+            if (!((pClass = CLASS_FindClassByAtom( className, pWnd->hInstance))
+                ||(pClass = CLASS_FindClassByAtom( className, GetExePtr(pWnd->hInstance))))
+               )
                 continue;  /* Skip this window */
         }