diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
index 416b9e8e0881..bb74c36c941f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
@@ -148,7 +148,13 @@ public class ActionButton extends JComponent implements ActionButtonComponent {
           return presentation;
         }
       });
-      popupMenu.getComponent().show(this, getWidth(), 0);
+      if (ActionPlaces.isToolbarPlace(event.getPlace())) {
+        popupMenu.getComponent().show(this, 0, getHeight());
+      }
+      else {
+        popupMenu.getComponent().show(this, getWidth(), 0);
+      }
+
     } else {
       myAction.actionPerformed(event);
     }