diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/toolbar/ToolbarFrameHeader.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/toolbar/ToolbarFrameHeader.kt
index dfde2bacc8a6..92c97fcd100e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/toolbar/ToolbarFrameHeader.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/toolbar/ToolbarFrameHeader.kt
@@ -319,11 +319,11 @@ internal class ToolbarFrameHeader(
         toolbarPlaceholder.add(newToolbar, BorderLayout.CENTER)
       }
 
+      mainMenuWithButton.recalculateWidth(newToolbar)
       newToolbar.revalidate()
       newToolbar.repaint()
       toolbarPlaceholder.revalidate()
       toolbarPlaceholder.repaint()
-      mainMenuWithButton.recalculateWidth(toolbar)
       this@ToolbarFrameHeader.revalidate()
       this@ToolbarFrameHeader.repaint()
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainMenuWithButton.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainMenuWithButton.kt
index 5e51d7376cf0..37959419be20 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainMenuWithButton.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainMenuWithButton.kt
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.ApiStatus
 import java.util.concurrent.ConcurrentLinkedDeque
 import javax.swing.Icon
 import javax.swing.JFrame
-import javax.swing.JMenu
 
 class MainMenuWithButton(
   val coroutineScope: CoroutineScope, private val frame: JFrame,
@@ -101,9 +100,9 @@ class MainMenuWithButton(
           toolbarMainMenu.add(item)
         }
         toolbarMainMenu.rootMenuItems.forEach { it.updateUI() }
-        toolbar.revalidate()
-        toolbar.repaint()
       }
+      toolbar.revalidate()
+      toolbar.repaint()
     }
   }