diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json
index d2c1179efa..db0b961045 100644
--- a/plugins/scenes/qpainter/qpainter.json
+++ b/plugins/scenes/qpainter/qpainter.json
@@ -27,7 +27,7 @@
         "Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma",
         "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
         "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
-        "Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件",
+        "Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件",
         "Id": "KWinSceneQPainter",
         "Name": "SceneQPainter",
         "Name[pl]": "QPainter sceny",
diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json
index 1d603655bd..a1ca903579 100644
--- a/plugins/scenes/xrender/xrender.json
+++ b/plugins/scenes/xrender/xrender.json
@@ -27,7 +27,7 @@
         "Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma",
         "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
         "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
-        "Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件",
+        "Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件",
         "Id": "KWinSceneXRender",
         "Name": "SceneXRender",
         "Name[pl]": "XRender sceny",
diff --git a/shell_client.cpp b/shell_client.cpp
index 27e9d698b0..5266e082f4 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -1547,8 +1547,6 @@ void ShellClient::installServerSideDecoration(KWayland::Server::ServerSideDecora
     connect(m_serverDecoration, &ServerSideDecorationInterface::modeRequested, this,
         [this] (ServerSideDecorationManagerInterface::Mode mode) {
             const bool changed = mode != m_serverDecoration->mode();
-            // always acknowledge the requested mode
-            m_serverDecoration->setMode(mode);
             if (changed && !m_unmapped) {
                 updateDecoration(false);
             }
diff --git a/wayland_server.cpp b/wayland_server.cpp
index 11a142d18c..78ab4c332e 100644
--- a/wayland_server.cpp
+++ b/wayland_server.cpp
@@ -337,6 +337,12 @@ bool WaylandServer::init(const QByteArray &socketName, InitalizationFlags flags)
             if (ShellClient *c = findClient(deco->surface())) {
                 c->installServerSideDecoration(deco);
             }
+            connect(deco, &ServerSideDecorationInterface::modeRequested, this,
+                [this, deco] (ServerSideDecorationManagerInterface::Mode mode) {
+                    // always acknowledge the requested mode
+                    deco->setMode(mode);
+                }
+            );
         }
     );
     m_decorationManager->create();