diff --git a/Source/Editor/GUI/MainMenu.cs b/Source/Editor/GUI/MainMenu.cs
index ef3e5202b..6479938a1 100644
--- a/Source/Editor/GUI/MainMenu.cs
+++ b/Source/Editor/GUI/MainMenu.cs
@@ -56,9 +56,6 @@ namespace FlaxEditor.GUI
             AutoFocus = false;
             AnchorPreset = AnchorPresets.HorizontalStretchTop;
             BackgroundColor = Style.Current.LightBackground;
-
-            if (Utilities.Utils.UseCustomWindowDecorations())
-                Height = 28;
         }
 
         /// <summary>
diff --git a/Source/Editor/GUI/WindowDecorations.cs b/Source/Editor/GUI/WindowDecorations.cs
index 1cde01532..d678acbd0 100644
--- a/Source/Editor/GUI/WindowDecorations.cs
+++ b/Source/Editor/GUI/WindowDecorations.cs
@@ -275,27 +275,31 @@ public class WindowDecorations : ContainerControl
         }
      
         // Buttons
+        float rightMostButtonX = Width;
         if (_closeButton != null)
         {
             _closeButton.Height = Height;
-            _closeButton.X = Width - _closeButton.Width;
+            _closeButton.X = rightMostButtonX - _closeButton.Width;
+            rightMostButtonX = _closeButton.X;
         }
         if (_maximizeButton != null)
         {
             _maximizeButton.Height = Height;
-            _maximizeButton.X = _closeButton.X - _maximizeButton.Width;
+            _maximizeButton.X = rightMostButtonX - _maximizeButton.Width;
+            rightMostButtonX = _maximizeButton.X;
         }
         if (_minimizeButton != null)
         {
             _minimizeButton.Height = Height;
-            _minimizeButton.X = _maximizeButton.X - _minimizeButton.Width;
+            _minimizeButton.X = rightMostButtonX - _minimizeButton.Width;
+            rightMostButtonX = _minimizeButton.X;
         }
 
         // Title
         if (_title != null)
         {
             _title.Text = _window.Title;
-            _title.Bounds = new Rectangle(x, 0, _minimizeButton.Left - x, Height);
+            _title.Bounds = new Rectangle(x, 0, rightMostButtonX - x, Height);
         }
     }
     
diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs
index bee2c481b..cae120ab6 100644
--- a/Source/Editor/Modules/UIModule.cs
+++ b/Source/Editor/Modules/UIModule.cs
@@ -528,6 +528,8 @@ namespace FlaxEditor.Modules
             {
                 Parent = mainWindow
             };
+            if (Utilities.Utils.UseCustomWindowDecorations(isMainWindow: true))
+                MainMenu.Height = 28;
 
             var inputOptions = Editor.Options.Options.Input;