1 files changed, 8 insertions, 0 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 2bc9f5a93a0..93bc90514c2 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1687,6 +1687,14 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv,
 
     unbind_to (specpdl_count, Qnil);
   }
+
+#if defined HAVE_XINPUT2 && defined USE_MOTIF
+  /* For some reason input focus isn't always restored to the outer
+     window after the menu pops down.  */
+  if (any_xi_grab_p)
+    XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+                    RevertToParent, CurrentTime);
+#endif
 }
 
 #endif /* not USE_GTK */