diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp
index c0053b4167..fd92bd6872 100644
--- a/src/xdgshellclient.cpp
+++ b/src/xdgshellclient.cpp
@@ -1192,7 +1192,9 @@ void XdgToplevelClient::initialize()
 {
     bool needsPlacement = isPlaceable();
 
-    updateDecoration(false, false);
+    // Decoration update is forced so an xdg_toplevel_decoration.configure event
+    // is sent if the client has called the set_mode() request with csd mode.
+    updateDecoration(false, true);
 
     if (supportsWindowRules()) {
         setupWindowRules(false);