diff --git a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java
index b3d9d549c7a3..df314b3e8c43 100644
--- a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java
+++ b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java
@@ -143,6 +143,11 @@ final class ImageEditorUI extends JPanel implements DataProvider, CopyProvider,
     ActionToolbar actionToolbar = actionManager.createActionToolbar(
       ImageEditorActions.ACTION_PLACE, actionGroup, true
     );
+    
+    // Make sure toolbar is 'ready' before it's added to component hierarchy 
+    // to prevent ActionToolbarImpl.updateActionsImpl(boolean, boolean) from increasing popup size unnecessarily
+    actionToolbar.updateActionsImmediately();
+    
     actionToolbar.setTargetComponent(this);
 
     JComponent toolbarPanel = actionToolbar.getComponent();