diff --git a/src/ssd/ssd_extents.c b/src/ssd/ssd_extents.c
index 28e19934..65e4d130 100644
--- a/src/ssd/ssd_extents.c
+++ b/src/ssd/ssd_extents.c
@@ -86,6 +86,9 @@ ssd_extents_create(struct view *view)
 	p = add_extent(part_list, LAB_SSD_PART_CORNER_BOTTOM_RIGHT, parent);
 	p->geometry->width = corner_size;
 	p->geometry->height = corner_size;
+
+	/* Initial manual update to keep X11 applications happy */
+	ssd_extents_update(view);
 }
 
 void
diff --git a/src/xwayland.c b/src/xwayland.c
index 7374a819..3b5680e7 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -290,7 +290,6 @@ map(struct view *view)
 
 	if (view->ssd.enabled) {
 		view->margin = ssd_thickness(view);
-		ssd_create(view);
 	}
 
 	if (!view->been_mapped) {
@@ -308,6 +307,11 @@ map(struct view *view)
 		view->been_mapped = true;
 	}
 
+	if (view->ssd.enabled) {
+		/* Create ssd after view_disover_output() had been called */
+		ssd_create(view);
+	}
+
 	if (view->ssd.enabled && !view->fullscreen && !view->maximized) {
 		top_left_edge_boundary_check(view);
 	}