diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 73453e0b1..c39e6a026 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -2314,6 +2314,7 @@ weston_wm_handle_leave(struct weston_wm *wm, xcb_generic_event_t *event)
 static void
 weston_wm_handle_focus_in(struct weston_wm *wm, xcb_generic_event_t *event)
 {
+	struct weston_wm_window *window;
 	xcb_focus_in_event_t *focus = (xcb_focus_in_event_t *) event;
 
 	/* Do not interfere with grabs */
@@ -2321,6 +2322,17 @@ weston_wm_handle_focus_in(struct weston_wm *wm, xcb_generic_event_t *event)
 	    focus->mode == XCB_NOTIFY_MODE_UNGRAB)
 		return;
 
+	if (!wm_lookup_window(wm, focus->event, &window))
+		return;
+
+	/* Sometimes apps like to focus their own windows, and we don't
+	 * want to prevent that - but we'd like to at least prevent any
+	 * attempt to focus a toplevel that isn't the currently activated
+	 * toplevel.
+	 */
+	if (!window->frame)
+		return;
+
 	/* Do not let X clients change the focus behind the compositor's
 	 * back. Reset the focus to the old one if it changed. */
 	if (!wm->focus_window || focus->event != wm->focus_window->id)