diff --git a/platform/platform-api/src/com/intellij/ui/ClickListener.java b/platform/platform-api/src/com/intellij/ui/ClickListener.java
index 0b1a371ede18..00c8b16bb304 100644
--- a/platform/platform-api/src/com/intellij/ui/ClickListener.java
+++ b/platform/platform-api/src/com/intellij/ui/ClickListener.java
@@ -36,7 +36,9 @@ public abstract class ClickListener {
 
       @Override
       public void mousePressed(MouseEvent e) {
-        clickPoint = e.getPoint();
+        if (!e.isPopupTrigger()) {
+          clickPoint = e.getPoint();
+        }
       }
 
       @Override
@@ -45,8 +47,9 @@ public abstract class ClickListener {
         Point clickedAt = clickPoint;
         clickPoint = null;
 
-        if (releasedAt.x < 0 || releasedAt.y < 0 || releasedAt.x >= c.getWidth() || releasedAt.y >= c.getWidth()) return;
         if (clickedAt == null) return;
+        if (e.isPopupTrigger()) return;
+        if (releasedAt.x < 0 || releasedAt.y < 0 || releasedAt.x >= c.getWidth() || releasedAt.y >= c.getWidth()) return;
 
         if (Math.abs(clickedAt.x - releasedAt.x) < EPS && Math.abs(clickedAt.y - releasedAt.y) < EPS) {
           onClick(e);