diff --git a/clients/window.c b/clients/window.c
index 2390485c..54f57a33 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -2168,6 +2168,8 @@ window_set_title(struct window *window, const char *title)
 {
 	free(window->title);
 	window->title = strdup(title);
+	if (window->shell_surface)
+		wl_shell_surface_set_title(window->shell_surface, title);
 }
 
 const char *
@@ -2218,6 +2220,9 @@ window_create_internal(struct display *display, struct window *parent)
 		window->shell_surface =
 			wl_shell_get_shell_surface(display->shell,
 						   window->surface);
+		if (window->title)
+			wl_shell_surface_set_title(window->shell_surface,
+						   window->title);
 	}
 	window->allocation.x = 0;
 	window->allocation.y = 0;