diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java
index cf4c30e1e813..95fec42e3ebb 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java
@@ -693,14 +693,15 @@ public abstract class ChangesTree extends Tree implements DataProvider {
   @Override
   protected void processMouseEvent(MouseEvent e) {
     if (e.getID() == MouseEvent.MOUSE_PRESSED) {
-      if (!isEnabled()) return;
-      int row = getRowForLocation(e.getX(), e.getY());
-      if (row >= 0) {
-        final Rectangle baseRect = getRowBounds(row);
-        baseRect.setSize(myCheckboxWidth, baseRect.height);
-        if (baseRect.contains(e.getPoint())) {
-          setSelectionRow(row);
-          toggleChanges(getSelectedUserObjects());
+      if (myShowCheckboxes && isEnabled() && !e.isPopupTrigger()) {
+        int row = getRowForLocation(e.getX(), e.getY());
+        if (row >= 0) {
+          final Rectangle baseRect = getRowBounds(row);
+          baseRect.setSize(myCheckboxWidth, baseRect.height);
+          if (baseRect.contains(e.getPoint())) {
+            setSelectionRow(row);
+            toggleChanges(getSelectedUserObjects());
+          }
         }
       }
     }