diff --git a/src/gui/src/IPC.js b/src/gui/src/IPC.js
index 1ac844705..f1b6833d6 100644
--- a/src/gui/src/IPC.js
+++ b/src/gui/src/IPC.js
@@ -600,9 +600,11 @@ const ipc_listener = async (event, handled) => {
 
         // Show menubar
         let $menubar;
-        if(window.menubar_style === 'window')
+        if(window.menubar_style === 'window'){
             $menubar = $(el_window).find('.window-menubar')
-        else{
+            // add window-with-menubar class to the window
+            $(el_window).addClass('window-with-menubar');
+        }else{
             $menubar = $('.window-menubar-global[data-window-id="'+$(el_window).attr('data-id')+'"]');
             // hide all other menubars
             $('.window-menubar-global').hide();
diff --git a/src/gui/src/UI/Settings/UITabPersonalization.js b/src/gui/src/UI/Settings/UITabPersonalization.js
index 202d4d982..11fd8480e 100644
--- a/src/gui/src/UI/Settings/UITabPersonalization.js
+++ b/src/gui/src/UI/Settings/UITabPersonalization.js
@@ -132,6 +132,9 @@ export default {
                         $(el).insertAfter('.toolbar-puter-logo');
                         // add window-menubar-global
                         $(el).addClass('window-menubar-global');
+                        // remove window-with-menubar from the window
+                        let win_id = $(el).attr('data-window-id');
+                        $('.window[data-id="'+win_id+'"]').removeClass('window-with-menubar');
                         // hide
                         $(el).hide();
                     })
@@ -142,6 +145,8 @@ export default {
                         $(el).insertAfter('.window[data-id="'+win_id+'"] .window-head');
                         // remove window-menubar-global
                         $(el).removeClass('window-menubar-global');
+                        // add window-with-menubar to the window
+                        $('.window[data-id="'+win_id+'"]').addClass('window-with-menubar');
                         // show
                         $(el).css('display', 'flex');
                     })
diff --git a/src/gui/src/css/style.css b/src/gui/src/css/style.css
index 51b674709..b4649c59e 100644
--- a/src/gui/src/css/style.css
+++ b/src/gui/src/css/style.css
@@ -1341,7 +1341,9 @@ span.header-sort-icon img {
 .window-body-app {
     height: calc(100% - 30px);
 }
-
+.window-with-menubar .window-body-app {
+    height: calc(100% - 65px);
+}
 .fullpage-mode.device-phone .window-body-app {
     height: calc(100%);
 }