From 548ebb02a4099ecc7cd525e18d2adc5652049655 Mon Sep 17 00:00:00 2001
From: Sergey Vasiliev <Sergey.Vasiliev@jetbrains.com>
Date: Thu, 25 Dec 2008 15:42:56 +0300
Subject: [PATCH] IDEADEV-25367

---
 .../com/intellij/util/xml/ui/actions/AddDomElementAction.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dom/openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java b/dom/openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java
index 9b031192d0..4e153c6648 100644
--- a/dom/openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java
+++ b/dom/openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java
@@ -102,13 +102,12 @@ public abstract class AddDomElementAction extends AnAction {
   }
 
   protected void showPopup(final ListPopup groupPopup, final AnActionEvent e) {
-    Component component = (Component)e.getDataContext().getData(DataConstants.CONTEXT_COMPONENT);
-    if (component == null) component = e.getInputEvent().getComponent();
+    final Component component = e.getInputEvent().getComponent();
 
-    if (component instanceof JMenuItem) {
-      groupPopup.showInBestPositionFor(e.getDataContext());
-    } else {
+    if (component instanceof ActionButtonComponent) {
       groupPopup.showUnderneathOf(component);
+    } else {
+      groupPopup.showInBestPositionFor(e.getDataContext());
     }
   }
 
-- 
2.11.4.GIT