diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 4a6d863b2d..54fb437cd0 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1470,7 +1470,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     ::ClientToScreen(hWnd, &point);
     wxCurrentPopupMenu = menu;
     ::TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, point.x, point.y, 0, hWnd, NULL);
-    wxYield();
+    wxYieldIfNeeded();
     wxCurrentPopupMenu = NULL;
 
     menu->SetInvokingWindow(NULL);