diff --git a/src/xterm.c b/src/xterm.c
index 9e0499ca0f2..9b434bffcc2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9289,6 +9289,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 			    event->xbutton.x, event->xbutton.y,
 			    event->xbutton.button, event->xbutton.state,
 			    event->xbutton.time);
+
+	    if (!EQ (selected_window, xvw->w))
+	      {
+		inev.ie.kind = SELECT_WINDOW_EVENT;
+		inev.ie.frame_or_window = xvw->w;
+	      }
 	    goto OTHER;
 	  }
 #endif