diff --git a/core/client/components/layout/KWindow.vue b/core/client/components/layout/KWindow.vue
index fe2247899..7623b0221 100644
--- a/core/client/components/layout/KWindow.vue
+++ b/core/client/components/layout/KWindow.vue
@@ -11,6 +11,7 @@
       <q-resize-observer @resize="onHeaderResized" />
       <!-- window menu -->
       <KPanel
+        v-if="currentWindow.controls.menu"
         :id="`${placement}-window-menu`"
         :content="menu"
         @touchstart.passive.stop
diff --git a/core/client/layout.js b/core/client/layout.js
index 6b5d8054e..00e9b2c62 100644
--- a/core/client/layout.js
+++ b/core/client/layout.js
@@ -17,7 +17,7 @@ export const DefaultZIndex = {
 const layoutPath = 'layout'
 const contentDefaults = { content: undefined, filter: {}, mode: undefined, visible: false }
 const paneDefaults = { opener: false, size: [0, 0], zIndex: DefaultZIndex.panes }
-const windowsDefaultControls = { pin: true, unpin: true, maximize: true, restore: true, close: true, resize: true }
+const windowsDefaultControls = { menu: true, pin: true, unpin: true, maximize: true, restore: true, close: true, resize: true }
 const windowDefaults = { state: undefined, position: undefined, size: undefined, current: undefined, controls: windowsDefaultControls, zIndex: 980 }
 const hWindowDefaultSizePolicy = {
   minSize: [300, 200],