diff --git a/src/xfns.c b/src/xfns.c
index 09bad715025..65218b3fc07 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3803,13 +3803,8 @@ x_window (struct frame *f, long window_prompting)
 		   FRAME_DISPLAY_INFO (f)->Xatom_wm_protocols,
 		   XA_ATOM, 32, PropModeAppend, NULL, 0);
 
-#if !defined USE_MOTIF || !defined HAVE_XINPUT2
   /* Make all the standard events reach the Emacs frame.  */
   attributes.event_mask = STANDARD_EVENT_SET;
-#else
-  /* This is used for Motif menus.  */
-  attributes.event_mask = STANDARD_EVENT_SET | PropertyChangeMask;
-#endif
 
 #ifdef HAVE_X_I18N
   if (FRAME_XIC (f))
diff --git a/src/xterm.h b/src/xterm.h
index f6c251649ff..7f45e2f172e 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -132,6 +132,7 @@ INLINE_HEADER_BEGIN
    | FocusChangeMask		\
    | LeaveWindowMask		\
    | EnterWindowMask		\
+   | PropertyChangeMask		\
    | VisibilityChangeMask)
 
 #ifdef HAVE_X11R6_XIM