2 files changed, 7 insertions, 2 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index f969636a..8d592872 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -291,7 +291,8 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
                 seat->cursor->cursor->y);
 }
 
-void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container) {
+void sway_seat_set_focus(struct sway_seat *seat,
+                struct sway_container *container) {
         struct sway_container *last_focus = sway_seat_get_focus(seat);
 
         if (container && last_focus == container) {
@@ -311,6 +312,11 @@ void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *containe
                 if (container->type == C_VIEW) {
                         struct sway_view *view = container->sway_view;
                         view_set_activated(view, true);
+                        if (view->type == SWAY_XWAYLAND_VIEW) {
+                                struct wlr_xwayland *xwayland =
+                                        seat->input->server->xwayland;
+                                wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
+                        }
                         struct wlr_keyboard *keyboard =
                                 wlr_seat_get_keyboard(seat->wlr_seat);
                         if (keyboard) {
diff --git a/sway/server.c b/sway/server.c
index 59e7dc3f..f5cc199c 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -110,7 +110,6 @@ bool server_init(struct sway_server *server) {
         }
 
         input_manager = sway_input_manager_create(server);
-
         return true;
 }