diff --git a/src/handlers.c b/src/handlers.c
index 4ee50626..580ba1f9 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -385,7 +385,9 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
         strncpy(client->name, xcb_get_property_value(prop), client->name_len);
         printf("rename to \"%.*s\".\n", client->name_len, client->name);
 
-        decorate_window(conn, client, client->frame, client->titlegc, 0);
+        if (client->container->mode == MODE_STACK)
+                render_container(conn, client->container);
+        else decorate_window(conn, client, client->frame, client->titlegc, 0);
         xcb_flush(conn);
 
         return 1;