diff --git a/headers/private/interface/WindowInfo.h b/headers/private/interface/WindowInfo.h
index 3769920cd8..d671680506 100644
--- a/headers/private/interface/WindowInfo.h
+++ b/headers/private/interface/WindowInfo.h
@@ -36,7 +36,7 @@ struct window_info {
 struct client_window_info : window_info {
 	float		tab_height;
 	float		border_size;
-	char		name[1];
+	char		name[0];
 } _PACKED;
 
 enum window_action {
diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index e5ceb6ae22..98fd48b9fe 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -2373,7 +2373,7 @@ Desktop::WriteWindowInfo(int32 serverToken, BPrivate::LinkSender& sender)
 	int32 length = window->Title() ? strlen(window->Title()) : 0;
 
 	sender.StartMessage(B_OK);
-	sender.Attach<int32>(sizeof(client_window_info) + length);
+	sender.Attach<int32>(sizeof(client_window_info) + length + 1);
 	sender.Attach(&info, sizeof(window_info));
 	sender.Attach<float>(tabSize);
 	sender.Attach<float>(borderSize);