diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 810961f87..8d4027a65 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -2929,10 +2929,10 @@ shell_interface_set_fullscreen(struct shell_surface *shsurf,
 			       struct weston_output *output)
 {
 	surface_clear_next_states(shsurf);
-	set_fullscreen(shsurf, method, framerate, output);
-
 	shsurf->next_state.fullscreen = true;
 	shsurf->state_changed = true;
+
+	set_fullscreen(shsurf, method, framerate, output);
 }
 
 static int
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 4e91f9dc3..76b1e2183 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -2193,7 +2193,7 @@ send_configure(struct weston_surface *surface, int32_t width, int32_t height)
 	struct theme *t = window->wm->theme;
 	int vborder, hborder;
 
-	if (window->decorate) {
+	if (window->decorate && !window->fullscreen) {
 		hborder = 2 * t->width;
 		vborder = t->titlebar_height + t->width;
 	} else {