4 files changed, 14 insertions, 3 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index d747e279..797f6b4c 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <time.h>
 #include <wlr/types/wlr_buffer.h>
+#include "sway/config.h"
 #include "sway/debug.h"
 #include "sway/desktop.h"
 #include "sway/desktop/idle_inhibit_v1.h"
@@ -390,6 +391,16 @@ static bool should_configure(struct sway_node *node,
 	}
 	struct sway_container_state *cstate = &node->sway_container->current;
 	struct sway_container_state *istate = instruction->container_state;
+#ifdef HAVE_XWAYLAND
+	// Xwayland views are position-aware and need to be reconfigured
+	// when their position changes.
+	if (node->sway_container->view->type == SWAY_VIEW_XWAYLAND) {
+		if (cstate->view_x != istate->view_x ||
+				cstate->view_y != istate->view_y) {
+			return true;
+		}
+	}
+#endif
 	if (cstate->view_width == istate->view_width &&
 			cstate->view_height == istate->view_height) {
 		return false;
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 00448be7..6d1ccdd7 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -401,7 +401,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 	} else {
 		if (view->container->parent) {
 			arrange_container(view->container->parent);
-		} else {
+		} else if (view->container->workspace) {
 			arrange_workspace(view->container->workspace);
 		}
 	}
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index d2c9a68b..95ca396c 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -398,7 +398,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 	} else {
 		if (view->container->parent) {
 			arrange_container(view->container->parent);
-		} else {
+		} else if (view->container->workspace) {
 			arrange_workspace(view->container->workspace);
 		}
 	}
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 3619f202..a12ac854 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -394,7 +394,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 	} else {
 		if (view->container->parent) {
 			arrange_container(view->container->parent);
-		} else {
+		} else if (view->container->workspace) {
 			arrange_workspace(view->container->workspace);
 		}
 	}