diff --git a/src/xdisp.c b/src/xdisp.c
index 42c579f5cbb..da2c0e7c7a0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16466,7 +16466,7 @@ display_menu_bar (w)
 
   /* Don't do all this for graphical frames.  */
 #ifdef HAVE_NTGUI
-  if (!NILP (Vwindow_system))
+  if (FRAME_W32_P (f))
     return;
 #endif
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)