diff --git a/shell_client.cpp b/shell_client.cpp
index 5959a557a0..954327f6c4 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -640,6 +640,9 @@ bool ShellClient::userCanSetFullScreen() const
 
 bool ShellClient::userCanSetNoBorder() const
 {
+    if (m_serverDecoration && m_serverDecoration->mode() == ServerSideDecorationManagerInterface::Mode::Server) {
+        return !isFullScreen() && !isShade() && !tabGroup();
+    }
     return false;
 }